Moved targetDistance into Experiment.h for now

NVlabs · Jul 3, 2019 · 902c3ac · 902c3ac
1 parent a5e073a
commit 902c3ac
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/target/source/App.cpp b/target/source/App.cpp
@@ -291,7 +291,8 @@ shared_ptr<JumpingEntity> App::spawnJumpingTarget(
 	const Vector2& distanceRange,
 	const Vector2& jumpSpeedRange,
 	const Vector2& gravityRange,
-	Point3 orbitCenter)
+	Point3 orbitCenter,
+	float targetDistance)
 {
 	const int scaleIndex = clamp(iRound(log(scale) / log(1.0f + TARGET_MODEL_ARRAY_SCALING) + TARGET_MODEL_ARRAY_OFFSET), 0, m_targetModelArray.length() - 1);
 

diff --git a/target/source/App.h b/target/source/App.h
@@ -137,8 +137,6 @@ class App : public GApp {
 	shared_ptr<Experiment> ex;										///< Pointer to the experiment
 	shared_ptr<Logger> logger;										///< Pointer to the logger
 
-	const float targetDistance = 1.0f;				///< Actual distance to target
-
 	/** Call to change the reticle. */
 	void setReticle(int r);
 
@@ -182,7 +180,8 @@ class App : public GApp {
 		const Vector2& distanceRange,
 		const Vector2& jumpSpeedRange,
 		const Vector2& gravityRange,
-		Point3 orbitCenter
+		Point3 orbitCenter,
+		float targetDistance
 	);
 
 

diff --git a/target/source/Experiment.cpp b/target/source/Experiment.cpp
@@ -165,7 +165,7 @@ void Experiment::initTargetAnimation() {
 
 		if (String(m_psych.getParam().str["jumpEnabled"].c_str()) == "true") {
 			m_app->spawnJumpingTarget(
-				f.pointToWorldSpace(Point3(0, 0, -m_app->targetDistance)),
+				f.pointToWorldSpace(Point3(0, 0, -m_targetDistance)),
 				visualSize,
 				m_targetColor,
 				{ m_psych.getParam().val["minSpeed"], m_psych.getParam().val["maxSpeed"] },
@@ -174,12 +174,13 @@ void Experiment::initTargetAnimation() {
 				{ m_psych.getParam().val["minDistance"], m_psych.getParam().val["maxDistance"] },
 				{ m_psych.getParam().val["minJumpSpeed"], m_psych.getParam().val["maxJumpSpeed"] },
 				{ m_psych.getParam().val["minGravity"], m_psych.getParam().val["maxGravity"] },
-				initialSpawnPos
+				initialSpawnPos,
+				m_targetDistance
 			);
 		}
 		else {
 			m_app->spawnFlyingTarget(
-				f.pointToWorldSpace(Point3(0, 0, -m_app->targetDistance)),
+				f.pointToWorldSpace(Point3(0, 0, -m_targetDistance)),
 				visualSize,
 				m_targetColor,
 				{ m_psych.getParam().val["minSpeed"], m_psych.getParam().val["maxSpeed"] },
@@ -192,7 +193,7 @@ void Experiment::initTargetAnimation() {
 		// Make sure we reset the target color here (avoid color bugs)
 		m_targetColor = Color3::red().pow(2.0f);
 		m_app->spawnFlyingTarget(
-			f.pointToWorldSpace(Point3(0, 0, -m_app->targetDistance)),
+			f.pointToWorldSpace(Point3(0, 0, -m_targetDistance)),
 			visualSize,
 			m_targetColor,
 			{ 0.0f, 0.0f },

diff --git a/target/source/Experiment.h b/target/source/Experiment.h
@@ -120,6 +120,7 @@ class Experiment : public ReferenceCountedObject {
 	const float m_userSpawnDistance = 0.0f;				///< Where the user is spawned (in the axis of the target)
 
 	// Target parameters
+	const float m_targetDistance = 1.0f;				///< Actual distance to target
 	Color3 m_targetColor = Color3::red();				///< Target color
 
 	// Reported data storage