Skip to content

Unexpected token #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elevatorguy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Unexpected token #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4559565
Unexpected token
elevatorguy Oct 13, 2022
e55992d
untested
elevatorguy Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions es/objects/objects.mr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,5 +604,6 @@ public node vehicle => __engine_sim__vehicle {

public node transmission => __engine_sim__transmission {
input max_clutch_torque [float]: 1000 * units.lb_ft;
input variable [bool]: false;
alias output __out [transmission_channel];
}
3 changes: 2 additions & 1 deletion include/transmission.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class Transmission {
int GearCount;
const double *GearRatios;
double MaxClutchTorque;
bool variable;
};

public:
Expand All @@ -32,9 +33,9 @@ class Transmission {
inline double getClutchPressure() const { return m_clutchPressure; }
inline void setDiskPosition(double position) { m_diskPosition = clamp(position); }
inline double getDiskPosition() const { return m_diskPosition; }
void enableSlidingDisk();
inline bool isVariable() { return maySlide; }
protected:
void enableSlidingDisk();
atg_scs::ClutchConstraint m_clutchConstraint;
atg_scs::RigidBody *m_rotatingMass;
Vehicle *m_vehicle;
Expand Down
2 changes: 1 addition & 1 deletion scripting/include/transmission_node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace es_script {
protected:
virtual void registerInputs() {
addInput("max_clutch_torque", &m_parameters.MaxClutchTorque);

addInput("variable", &m_parameters.variable);
ObjectReferenceNode<TransmissionNode>::registerInputs();
}

Expand Down
3 changes: 2 additions & 1 deletion src/engine_sim_application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ void EngineSimApplication::processEngineInput() {
fineControlInUse = true;
}
else if (m_engine.IsKeyDown(ysKey::Code::J)) {
(*m_transmission).enableSlidingDisk(); //todo: disable
if ((*m_transmission).isVariable()) {
double diskPosition = (*m_transmission).getDiskPosition();
if (mouseWheelDelta > 0) {
(*m_transmission).setDiskPosition(diskPosition + 0.01);
Expand All @@ -773,6 +773,7 @@ void EngineSimApplication::processEngineInput() {

m_infoCluster->setLogMessage("[J] - T Disk position currently " + std::to_string((int)((1.0-diskPosition)*100))+"%");
fineControlInUse = true;
}
}

const double prevTargetThrottle = m_targetSpeedSetting;
Expand Down
3 changes: 3 additions & 0 deletions src/transmission.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ void Transmission::initialize(const Parameters &params) {
m_diskMax = m_gearRatios[0];
m_diskMin = m_gearRatios[params.GearCount - 1];
}
if (params.variable) {
enableSlidingDisk();
}
}

void Transmission::update(double dt) {
Expand Down