kyush/principia
1
0
Fork 0
forked from mirrors/principia
Code Pull requests Activity Actions

Clean up commented out code in wall pivot source file

Browse source 
Likely half-remaining remnants from when the wall pivot was like the static motor in Apparatus
This commit is contained in:
ROllerozxa 2026-06-05 20:23:40 +02:00
commit 422e95b14c
2 changed files with 1 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/wmotor.cc
View file

@ -4,9 +4,6 @@
#include "model.hh" #include "model.hh"
#include "material.hh" #include "material.hh"
#define SPEED 20.f
#define TORQUE 1000.f
class wmotor_query_cb : public b2QueryCallback class wmotor_query_cb : public b2QueryCallback
{ {
public: public:
@ -53,7 +50,6 @@ wmotor::wmotor()
tmat3_load_identity(this->N); tmat3_load_identity(this->N);
this->set_num_properties(0); this->set_num_properties(0);
//this->properties[0].v.f = .5f;
this->update_method = ENTITY_UPDATE_STATIC; this->update_method = ENTITY_UPDATE_STATIC;
@ -147,35 +143,3 @@ wmotor::load_connection(connection &conn)
this->c = conn; this->c = conn;
return &this->c; return &this->c;
} }
/*
bool
wmotor::solve_electronics()
{
if (!this->s_in[0].is_ready())
return false;
if (!this->s_in[1].is_ready())
return false;
float v = this->s_in[0].get_value();
float tradeoff = this->s_in[1].p ? this->s_in[1].get_value() : this->properties[0].v.f;
tradeoff = .02f + tradeoff*.96f;
float voltage = tradeoff * v * SPEED;
float current = (1.f-tradeoff) * v * TORQUE;
b2RevoluteJoint *j = this->c.j;
if (j) {
if (voltage <= 0.f || current <= 0.f) {
j->EnableMotor(false);
} else {
j->SetMotorSpeed(voltage);
j->SetMaxMotorTorque(current);
j->EnableMotor(true);
}
}
return true;
}
*/

7
src/wmotor.hh
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "edevice.hh" #include "entity.hh"
class wmotor : public entity class wmotor : public entity
{ {
@ -10,14 +10,9 @@ class wmotor : public entity
public: public:
wmotor(); wmotor();
void add_to_world(); void add_to_world();
//bool solve_electronics();
void update(); void update();
const char *get_name(){return "Wall pivot";}; const char *get_name(){return "Wall pivot";};
void find_pairs(); void find_pairs();
void connection_create_joint(connection *c); void connection_create_joint(connection *c);
connection* load_connection(connection &conn); connection* load_connection(connection &conn);
//float get_slider_snap(int s){return .05f;};
//float get_slider_value(int s){return this->properties[0].v.f;};
//void on_slider_change(int s, float value){this->properties[0].v.f=value;};
}; };