Skip to content

Commit

Permalink
Boat and car steering, some helicopter stuff
Browse files Browse the repository at this point in the history 
Change some bike and car stuff to use adf things instead
  • Loading branch information
@xforce
xforce committed Dec 11, 2016
1 parent d3d37c8 commit b7b7c6d
Show file tree
Hide file tree
Showing 6 changed files with 323 additions and 184 deletions.
2 changes: 1 addition & 1 deletion deps/jc3_api
Submodule jc3_api updated 1 files
+28 −1 jc3/entities/pfx/pfx_vehicle.h
25 changes: 3 additions & 22 deletions src/jc3_handling_editor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,25 +581,6 @@ BOOL WINAPI DllMain(
}

if (overlayState) {
ImGui::Combo("meow", &lastSelectedVehicle, vehicleList);
ImGui::SameLine();
if(ImGui::Button("Spawkn")) {
auto &meow = vehicle_hashes[lastSelectedVehicle];
if (meow["hash"].is_number()) {
auto modelId = jc3::CSpawnSystem::instance()->GetModelId(meow["hash"]);
jc3::Matrix spawnMatrix;
jc3::CCharacter::GetLocalPlayerCharacter()->GetTransform(&spawnMatrix);
spawnMatrix.SetPosition(jc3::CCharacter::GetLocalPlayerCharacter()->AimPositionWeapons);
jc3::CSpawnSystem::instance()->Spawn(modelId, spawnMatrix, 0x2207C,
[](jc3::CSpawnSystem::SpawnFactoryRequest* factoryRequest, stl::vector<boost::shared_ptr<jc3::CGameObject>>* spawned_objects, void* userdata) {
for (auto object : *spawned_objects) {
if (object->IsType(jc3::CGameObject::GetClassIdByName("CVehicle"))) {
}
}
});
}
}
ImGui::Spacing();
if (jc3::CCharacter::GetLocalPlayerCharacter()) {
auto vehicle = jc3::CCharacter::GetLocalPlayerCharacter()->GetVehicle();

Expand Down Expand Up @@ -653,7 +634,7 @@ BOOL WINAPI DllMain(
ImGui::SameLine();
if (ImGui::Button("Save")) {
if (g_profiles[currentVehicleItem.modelName].empty()) {
ImGui::OpenPopup("Stacked 1f55577f");
ImGui::OpenPopup("Stacked");
show_save_as = true;
}
if (!show_save_as) {
Expand All @@ -669,14 +650,14 @@ BOOL WINAPI DllMain(

ImGui::SameLine();
if (ImGui::Button("Save As")) {
ImGui::OpenPopup("Stacked k1");
ImGui::OpenPopup("Stacked");
show_save_as = true;
}

static bool open = true;
{
ImGui::SetNextWindowSize(ImVec2(300, 90), ImGuiSetCond_FirstUseEver);
if (ImGui::BeginPopupModal("Stacked 1777"))
if (ImGui::BeginPopupModal("Stacked"))
{
static char buf[256] = {0};
ImGui::InputText("Name", buf, sizeof(buf));
Expand Down
141 changes: 71 additions & 70 deletions src/ui_menus/bike_ui_menu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,63 +46,62 @@ void DoMotorBikeHandlingUI(jc3::CVehicle *real_vehicle, jc3::CPfxVehicle *pfxVeh
ImGui::TreePop();
}


if (ImGui::CollapsingHeader("Engine"))
{
ImGui::TreePush("Engine");
auto engine = pfxBike->landVehicleEngine;
ImGui::Checkbox("Is Clutching", (bool*)&engine->isClutching);
ImGui::DragFloat("Clutch delay", &engine->clutchDelay);
ImGui::DragFloat("Clutching Time", &engine->clutchingTime);
ImGui::DragFloat("Clutch amount", &engine->clutchAmount);
ImGui::DragFloat("Manual Clutch Engage Timer", &engine->manualClutchEngageTimer);
ImGui::DragFloat("Source clutch Rpm", &engine->sourceClutchRpm);
ImGui::DragFloat("Target Clutch Rpm", &engine->targetClutchRpm);
ImGui::DragFloat("Engine Revs", &engine->engineRevs);
ImGui::DragFloat("Engine Damage", &engine->engineDamage);
ImGui::DragFloat("Rev Limiter Magnitude RPM", &engine->revLimiterMagnitudeRPM);
ImGui::Checkbox("Is Rev Limiting", (bool*)&engine->isRevLimiting);
ImGui::DragFloat("Full Load Torque", &engine->fullLoadTorque);
ImGui::DragFloat("Lowest Max Torque", &engine->lowestMaxTorque);
ImGui::DragFloat("Engine Min Noise", &engine->engineMinNoise);
ImGui::DragFloat("Engine Damage Noise Scale", &engine->engineDamageNoiseScale);
ImGui::DragFloat("Engine Max Damage Torque Factor", &engine->engineMaxDamageTorqueFactor);
ImGui::DragFloat("Min RPM", &engine->minRPM);
ImGui::DragFloat("Optimal RPM", &engine->optRPM);
ImGui::DragFloat("Max Torque", &engine->maxTorque);
ImGui::DragFloat("Torque Factor at Min RPM", &engine->torqueFactorAtMinRPM);
ImGui::DragFloat("Torque Factor at Max RPM", &engine->torqueFactorAtMaxRPM);
ImGui::DragFloat("Resistance Factor at Min RPM", &engine->resistanceFactorAtMinRPM);
ImGui::DragFloat("Resistance Factor at Optimal RPM", &engine->resistanceFactorAtOptRPM);
ImGui::DragFloat("Resistance Factor at Max RPM", &engine->resistanceFactorAtMaxRPM);
ImGui::DragFloat("Clutch Slop RPM", &engine->clutchSlipRPM);
ImGui::DragFloat("Max RPM", &engine->maxRPM);
ImGui::DragFloat("Overdrive Max RPM", &engine->overdriveMaxRPM);
ImGui::Checkbox("Overdrive Active", (bool*)&engine->isOverdriveActive);
auto engine = pfxBike->landEngineResourceCachePtr.data;
ImGui::DragFloat("resistance_at_min_rpm", &engine->resistance_at_min_rpm);
ImGui::DragFloat("resistance_at_max_rpm", &engine->resistance_at_max_rpm);
ImGui::DragFloat("resistance_at_optimal_rpm", &engine->resistance_at_optimal_rpm);
ImGui::DragFloat("rev_limiter_rpm_drop", &engine->rev_limiter_rpm_drop);
ImGui::DragFloat("max_rpm", &engine->max_rpm);
ImGui::DragFloat("min_rpm", &engine->min_rpm);
ImGui::DragFloat("optimal_rpm", &engine->optimal_rpm);
ImGui::DragFloat("torque_factor_at_max_rpm", &engine->torque_factor_at_max_rpm);
ImGui::DragFloat("torque_factor_at_min_rpm", &engine->torque_factor_at_min_rpm);
ImGui::DragFloat("torque_factor_at_optimal_rpm", &engine->torque_factor_at_optimal_rpm);
ImGui::DragFloat("clutch_slip_rpm", &engine->clutch_slip_rpm);
ImGui::DragFloat("engine_min_noise", &engine->engine_min_noise);
ImGui::DragFloat("engine_damage_noise_scale", &engine->engine_damage_noise_scale);
ImGui::DragFloat("engine_max_damage_torque", &engine->engine_max_damage_torque);
ImGui::TreePop();

pfxBike->ApplyLandEngine(*pfxBike->landEngineResourceCachePtr.data);
}

if (ImGui::CollapsingHeader("Engine Transmission")) {
ImGui::TreePush("Engine Transmission");
auto engineTransmission = pfxBike->landVehicleTransmission;

ImGui::SliderFloat("Forward Torque Ratio", &engineTransmission->transmissionProperties.forwardTorqueRatio, 0, 128);
ImGui::SliderFloat("Low Gear Forward Torque Ratio", &engineTransmission->transmissionProperties.lowGearForwardTorqueRatio, 0, 128);
ImGui::SliderFloat("Max Transmission RPM", &engineTransmission->transmissionProperties.maxTransmissionRPM, 0, 128);
ImGui::SliderFloat("Max Reverse Transmission RPM", &engineTransmission->transmissionProperties.maxReversingTransmissionRPM, 0, 128);
ImGui::SliderFloat("Target Cruise RPM", &engineTransmission->transmissionProperties.targetCruiseRPM, 0, 50000);
ImGui::SliderFloat("Decay Time to Cruise RPM", &engineTransmission->transmissionProperties.decayTimeToCruiseRPM, -10, 128);
ImGui::SliderFloat("Low Gearing Primary Transmission Ratio", &engineTransmission->transmissionProperties.lowGearingPrimaryTransmissionRatio, -10, 128);
ImGui::SliderFloat("Downshift RPM", &engineTransmission->transmissionProperties.downshiftRPM, 0, 50000);
ImGui::SliderFloat("Upshift RPM", &engineTransmission->transmissionProperties.upshiftRPM, 0, 50000);
ImGui::SliderFloat("Primary Transmission Ratio", &engineTransmission->transmissionProperties.primaryTransmissionRatio, 0, 128);
for (int i = 0; i < engineTransmission->transmissionProperties.wheelsTorqueRatio.size; ++i) {

ImGui::DragInt("gears", &pfxBike->transmissionResourceCachePtr.data->gears);
ImGui::DragInt("nitrous_gears", &pfxBike->transmissionResourceCachePtr.data->nitrous_gears);

ImGui::DragInt("sequential", &pfxBike->transmissionResourceCachePtr.data->sequential);
ImGui::DragInt("manual_clutch", &pfxBike->transmissionResourceCachePtr.data->manual_clutch);

ImGui::DragFloat("manual_clutch_blend_rpm", &pfxBike->transmissionResourceCachePtr.data->manual_clutch_blend_rpm);
ImGui::DragFloat("manual_clutch_blend_time", &pfxBike->transmissionResourceCachePtr.data->manual_clutch_blend_time);
ImGui::DragFloat("forward_ratio_percentage", &pfxBike->transmissionResourceCachePtr.data->forward_ratio_percentage);
ImGui::DragFloat("low_gear_forward_ratio_pct", &pfxBike->transmissionResourceCachePtr.data->low_gear_forward_ratio_pct);

ImGui::DragFloat("top_speed", &pfxBike->transmissionResourceCachePtr.data->top_speed);
ImGui::DragFloat("low_gears_final_drive", &pfxBike->transmissionResourceCachePtr.data->low_gears_final_drive);
ImGui::DragFloat("final_drive", &pfxBike->transmissionResourceCachePtr.data->final_drive);
ImGui::DragFloat("reverse_gear_ratio", &pfxBike->transmissionResourceCachePtr.data->reverse_gear_ratio);
ImGui::DragFloat("clutch_delay", &pfxBike->transmissionResourceCachePtr.data->clutch_delay);
ImGui::DragFloat("decay_time_to_cruise_rpm", &pfxBike->transmissionResourceCachePtr.data->decay_time_to_cruise_rpm);
ImGui::DragFloat("target_cruise_rpm", &pfxBike->transmissionResourceCachePtr.data->target_cruise_rpm);

for (int i = 0; i < pfxBike->transmissionResourceCachePtr.data->gears; ++i) {
char wheel_text[100];
sprintf(wheel_text, "Wheel Torque Ratio %d", i);
ImGui::TreePush(wheel_text);
ImGui::SliderFloat(wheel_text, &engineTransmission->transmissionProperties.wheelsTorqueRatio.Data[i], 0, 128);
ImGui::SliderFloat(wheel_text, &pfxBike->transmissionResourceCachePtr.data->gear_ratios[i], 0, 128);
ImGui::TreePop();
}
ImGui::TreePop();

pfxBike->ApplyTransmission(*pfxBike->transmissionResourceCachePtr.data);
}

if (ImGui::CollapsingHeader("Suspension")) {
Expand Down Expand Up @@ -138,26 +137,28 @@ void DoMotorBikeHandlingUI(jc3::CVehicle *real_vehicle, jc3::CPfxVehicle *pfxVeh
if (ImGui::CollapsingHeader("Brakes")) {
ImGui::TreePush("Brakes Front");
ImGui::Text("Front");
ImGui::Checkbox("Handbrake", (bool*)&pfxBike->brakesProperties->front.handbrake);
ImGui::DragFloat("Max Brake Torque", &pfxBike->brakesProperties->front.max_brake_torque);
ImGui::DragFloat("Time To Block", &pfxBike->brakesProperties->front.min_time_to_block);
ImGui::Checkbox("Handbrake", (bool*)&pfxBike->brakesResourceCachePtr.data->front.handbrake);
ImGui::DragFloat("Max Brake Torque", &pfxBike->brakesResourceCachePtr.data->front.max_brake_torque);
ImGui::DragFloat("Time To Block", &pfxBike->brakesResourceCachePtr.data->front.min_time_to_block);
ImGui::TreePop();
ImGui::Separator();
ImGui::Text("Rear");
ImGui::TreePush("Brakes Rear");
ImGui::Checkbox("Handbrake", (bool*)&pfxBike->brakesProperties->rear.handbrake);
ImGui::DragFloat("Max Brake Torque", &pfxBike->brakesProperties->rear.max_brake_torque);
ImGui::DragFloat("Time To Block", &pfxBike->brakesProperties->rear.min_time_to_block);
ImGui::Checkbox("Handbrake", (bool*)&pfxBike->brakesResourceCachePtr.data->rear.handbrake);
ImGui::DragFloat("Max Brake Torque", &pfxBike->brakesResourceCachePtr.data->rear.max_brake_torque);
ImGui::DragFloat("Time To Block", &pfxBike->brakesResourceCachePtr.data->rear.min_time_to_block);
pfxBike->ApplyBrakes(*pfxBike->brakesResourceCachePtr.data);
ImGui::TreePop();
}

if (ImGui::CollapsingHeader("Aerodynamics")) {
ImGui::TreePush("Aerodynamic");
ImGui::DragFloat("Air Density", &pfxBike->landAerodynamics->air_density);
ImGui::DragFloat("Frontal Area", &pfxBike->landAerodynamics->frontal_area);
ImGui::DragFloat("Drag Coefficient", &pfxBike->landAerodynamics->drag_coefficient);
ImGui::DragFloat("Top Speed Drag Coefficient", &pfxBike->landAerodynamics->top_speed_drag_coefficient);
ImGui::DragFloat("Lift Coefficient", &pfxBike->landAerodynamics->lift_coefficient);
ImGui::DragFloat("Air Density", &pfxBike->landAerodynamicsResourceCachePtr.data->air_density);
ImGui::DragFloat("Frontal Area", &pfxBike->landAerodynamicsResourceCachePtr.data->frontal_area);
ImGui::DragFloat("Drag Coefficient", &pfxBike->landAerodynamicsResourceCachePtr.data->drag_coefficient);
ImGui::DragFloat("Top Speed Drag Coefficient", &pfxBike->landAerodynamicsResourceCachePtr.data->top_speed_drag_coefficient);
ImGui::DragFloat("Lift Coefficient", &pfxBike->landAerodynamicsResourceCachePtr.data->lift_coefficient);
pfxBike->ApplyLandAerodynamics(*pfxBike->landAerodynamicsResourceCachePtr.data);
ImGui::TreePop();
}

Expand Down Expand Up @@ -216,22 +217,22 @@ void DoMotorBikeHandlingUI(jc3::CVehicle *real_vehicle, jc3::CPfxVehicle *pfxVeh
ImGui::DragFloat("wheel_drift_aligning_strength", &pfxBike->motorbikeSteeringResourceCachePtr.data->land_steering.wheel_drift_aligning_strength);

ImGui::Text("Wheelie");
ImGui::TreePush("Steering Wheelie");
ImGui::DragFloat("max_lean_angle_deg", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.max_lean_angle_deg);
ImGui::DragFloat("input_reactiveness", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.input_reactiveness);
ImGui::DragFloat("dead_zone", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.dead_zone);
ImGui::DragFloat("min_speed", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.min_speed);
ImGui::DragFloat("wheelie_angle_deg", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.wheelie_angle_deg);
ImGui::DragFloat("wheelie_torque", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.wheelie_torque);
ImGui::DragFloat("wheelie_center_of_mass_offset x", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.wheelie_center_of_mass_offset[0]);
ImGui::DragFloat("wheelie_center_of_mass_offset y", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.wheelie_center_of_mass_offset[1]);
ImGui::DragFloat("wheelie_center_of_mass_offset z", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.wheelie_center_of_mass_offset[2]);
ImGui::DragFloat("nosie_angle_deg", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.nosie_angle_deg);
ImGui::DragFloat("nosie_torque", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.nosie_torque);
ImGui::DragFloat("nosie_center_of_mass_offset x", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.nosie_center_of_mass_offset[0]);
ImGui::DragFloat("nosie_center_of_mass_offset y", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.nosie_center_of_mass_offset[1]);
ImGui::DragFloat("nosie_center_of_mass_offset z", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.nosie_center_of_mass_offset[2]);
ImGui::TreePop();
ImGui::TreePush("Steering Wheelie");
ImGui::DragFloat("max_lean_angle_deg", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.max_lean_angle_deg);
ImGui::DragFloat("input_reactiveness", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.input_reactiveness);
ImGui::DragFloat("dead_zone", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.dead_zone);
ImGui::DragFloat("min_speed", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.min_speed);
ImGui::DragFloat("wheelie_angle_deg", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.wheelie_angle_deg);
ImGui::DragFloat("wheelie_torque", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.wheelie_torque);
ImGui::DragFloat("wheelie_center_of_mass_offset x", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.wheelie_center_of_mass_offset[0]);
ImGui::DragFloat("wheelie_center_of_mass_offset y", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.wheelie_center_of_mass_offset[1]);
ImGui::DragFloat("wheelie_center_of_mass_offset z", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.wheelie_center_of_mass_offset[2]);
ImGui::DragFloat("nosie_angle_deg", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.nosie_angle_deg);
ImGui::DragFloat("nosie_torque", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.nosie_torque);
ImGui::DragFloat("nosie_center_of_mass_offset x", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.nosie_center_of_mass_offset[0]);
ImGui::DragFloat("nosie_center_of_mass_offset y", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.nosie_center_of_mass_offset[1]);
ImGui::DragFloat("nosie_center_of_mass_offset z", &pfxBike->motorbikeSteeringResourceCachePtr.data->wheelie.nosie_center_of_mass_offset[2]);
ImGui::TreePop();
ImGui::TreePop();

pfxBike->ApplyMotorbikeSteering(*pfxBike->motorbikeSteeringResourceCachePtr.data);
Expand Down
Loading

0 comments on commit b7b7c6d

Please sign in to comment.