Merge pull request orbiternassp#594 from jalexb88/CMVC

CMVC: Remove bad call in SetStage; Fix offset definitions in Register…
GuyResh · Mar 31, 2021 · 372ec7f · 372ec7f
2 parents 60f3765 + 8aad305
commit 372ec7f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/ecs.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/ecs.cpp
@@ -873,6 +873,7 @@ SaturnSideHatch::SaturnSideHatch(Sound &opensound, Sound &closesound) :
 	open = true;	// Hatch open at prelaunch
 	toggle = 0;
 
+	sidehatch_state.SetState(1.0, 0.0);
 	sidehatch_state.SetOperatingSpeed(0.2);
 	anim_SideHatchVC = -1;
 	anim_gearboxsel = -1;

diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp
@@ -2594,8 +2594,6 @@ void Saturn::SetStage(int s)
 	CheckSMSystemsState();
 	CheckSaturnSystemsState();
 
-	if (InVC) RegisterActiveAreas();
-
 	//
 	// Event management
 	//

diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturnvc.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturnvc.cpp
@@ -779,7 +779,7 @@ bool Saturn::clbkLoadVC (int id)
 	case SATVIEW_LEFTDOCK:
 		viewpos = SATVIEW_LEFTDOCK;
 		SetCameraMovement(_V(0.0, 0.0, 0.0), 0, 0, _V(0.0, 0.0, 0.0), 0, 0, _V(0.0, 0.0, 0.0), 0, 0);
-		oapiVCSetNeighbours(-1, -1, -1, SATVIEW_LEFTSEAT);
+		oapiVCSetNeighbours(-1, SATVIEW_RIGHTDOCK, -1, SATVIEW_LEFTSEAT);
 		SetCOASMesh();
 		SetView(true);
 
@@ -788,7 +788,7 @@ bool Saturn::clbkLoadVC (int id)
 	case SATVIEW_RIGHTDOCK:
 		viewpos = SATVIEW_RIGHTDOCK;
 		SetCameraMovement(_V(0.0, 0.0, 0.0), 0, 0, _V(0.0, 0.0, 0.0), 0, 0, _V(0.0, 0.0, 0.0), 0, 0);
-		oapiVCSetNeighbours(-1, -1, -1, SATVIEW_RIGHTSEAT);
+		oapiVCSetNeighbours(SATVIEW_LEFTDOCK, -1, -1, SATVIEW_RIGHTSEAT);
 		SetView(true);
 
 		return true;
@@ -843,23 +843,34 @@ void Saturn::RegisterActiveAreas() {
 	int i = 0;
 
 	VECTOR3 ofs = _V(0.0, 0.0, 0.0);
-	if (vcidx != -1) GetMeshOffset(vcidx, ofs);
-
-	/*if (stage < 12) {
-		ofs.z = 43.65;
-	} else if (stage < 20) {
-		ofs.z = 28.5;
-	} else if (stage < 30) {
-		ofs.z = 15.25;
-	} else if (stage < 40) {
-		ofs.z = 2.1;
-	} else if (stage < 42) {
-		ofs.z = 0.0;
-	} else {
-		ofs.z = -1.2;
-	}*/
 
-	//sprintf(oapiDebugString(), "OFS %lf", ofs.z);
+	if (SaturnType == SAT_SATURNV) {
+		if (stage < 12) {
+			ofs.z = 43.65;
+		} else if (stage < 20) {
+			ofs.z = 28.5;
+		} else if (stage < 30) {
+			ofs.z = 15.25;
+		} else if (stage < 40) {
+			ofs.z = 2.1;
+		} else if (stage < 42) {
+			ofs.z = 0.0;
+		} else {
+			ofs.z = -1.2;
+		}
+	} else {
+		if (stage < 12) {
+			ofs.z = 35.15;
+		} else if (stage < 30) {
+			ofs.z = 22.9;
+		} else if (stage < 40) {
+			ofs.z = 2.1;
+		} else if (stage < 42) {
+			ofs.z = 0.0;
+		} else {
+			ofs.z = -1.2;
+		}
+	}
 
 	//
 	// Register active areas for switches/animations here