Browse Source

Remove some leftover debug code

Panagiotis Christopoulos Charitos 3 years ago
parent
commit
0e6e5061c6
2 changed files with 5 additions and 55 deletions
  1. 1 2
      AnKi/Shaders/GBufferGeneric.ankiprog
  2. 4 53
      Sandbox/Main.cpp

+ 1 - 2
AnKi/Shaders/GBufferGeneric.ankiprog

@@ -368,8 +368,7 @@ void main()
 	const Vec2 velocity = Vec2(1.0);
 	const Vec2 velocity = Vec2(1.0);
 #	endif
 #	endif
 
 
-	packGBuffer(diffColor, normal, specColor, roughness, localUniforms.m_subsurface, emission * 0.00001, metallic,
-				velocity);
+	packGBuffer(diffColor, normal, specColor, roughness, localUniforms.m_subsurface, emission, metallic, velocity);
 #elif ANKI_TECHNIQUE == RENDERING_TECHNIQUE_GBUFFER_EZ
 #elif ANKI_TECHNIQUE == RENDERING_TECHNIQUE_GBUFFER_EZ
 	out_gbuffer0 = Vec4(0.0);
 	out_gbuffer0 = Vec4(0.0);
 	out_gbuffer1 = Vec4(0.0);
 	out_gbuffer1 = Vec4(0.0);

+ 4 - 53
Sandbox/Main.cpp

@@ -19,11 +19,6 @@ public:
 	Bool m_profile = false;
 	Bool m_profile = false;
 	ConfigSet m_config;
 	ConfigSet m_config;
 
 
-	AnimationResourcePtr m_danceAnim;
-	AnimationResourcePtr m_punchAnim;
-	AnimationResourcePtr m_capoeiraAnim;
-	AnimationResourcePtr m_kickAnim;
-
 	Error init(int argc, char* argv[]);
 	Error init(int argc, char* argv[]);
 	Error userMainLoop(Bool& quit, Second elapsedTime) override;
 	Error userMainLoop(Bool& quit, Second elapsedTime) override;
 };
 };
@@ -77,50 +72,6 @@ Error MyApp::init(int argc, char* argv[])
 	pnode->addChild(&cam);
 	pnode->addChild(&cam);
 #endif
 #endif
 
 
-	ANKI_CHECK(getResourceManager().loadResource("Assets/Dance_5502fb39d4a4ca65.ankianim", m_danceAnim));
-	ANKI_CHECK(getResourceManager().loadResource("Assets/Kick_645abd9bd3a36a5b.ankianim", m_kickAnim));
-	ANKI_CHECK(getResourceManager().loadResource("Assets/Punch_3850f7b59d10e18a.ankianim", m_punchAnim));
-	ANKI_CHECK(getResourceManager().loadResource("Assets/Capoeira_b753bfdd90ac4b7f.ankianim", m_capoeiraAnim));
-
-	AnimationPlayInfo animInfo;
-	animInfo.m_startTime = 2.0;
-	animInfo.m_repeatTimes = -1.0;
-	getSceneGraph()
-		.findSceneNode("Alpha_Surface")
-		.getFirstComponentOfType<SkinComponent>()
-		.playAnimation(0, m_capoeiraAnim, animInfo);
-	getSceneGraph()
-		.findSceneNode("Alpha_Joints")
-		.getFirstComponentOfType<SkinComponent>()
-		.playAnimation(0, m_capoeiraAnim, animInfo);
-
-	getSceneGraph()
-		.findSceneNode("Alpha_Surface.001")
-		.getFirstComponentOfType<SkinComponent>()
-		.playAnimation(0, m_danceAnim, animInfo);
-	getSceneGraph()
-		.findSceneNode("Alpha_Joints.001")
-		.getFirstComponentOfType<SkinComponent>()
-		.playAnimation(0, m_danceAnim, animInfo);
-
-	getSceneGraph()
-		.findSceneNode("Alpha_Surface.002")
-		.getFirstComponentOfType<SkinComponent>()
-		.playAnimation(0, m_punchAnim, animInfo);
-	getSceneGraph()
-		.findSceneNode("Alpha_Joints.002")
-		.getFirstComponentOfType<SkinComponent>()
-		.playAnimation(0, m_punchAnim, animInfo);
-
-	getSceneGraph()
-		.findSceneNode("Alpha_Surface.003")
-		.getFirstComponentOfType<SkinComponent>()
-		.playAnimation(0, m_kickAnim, animInfo);
-	getSceneGraph()
-		.findSceneNode("Alpha_Joints.003")
-		.getFirstComponentOfType<SkinComponent>()
-		.playAnimation(0, m_kickAnim, animInfo);
-
 	return Error::NONE;
 	return Error::NONE;
 }
 }
 
 
@@ -196,10 +147,10 @@ Error MyApp::userMainLoop(Bool& quit, Second elapsedTime)
 		renderer.getDbg().switchDepthTestEnabled();
 		renderer.getDbg().switchDepthTestEnabled();
 	}
 	}
 
 
-	/*if(in.getKey(KeyCode::F11) == 1)
+	if(in.getKey(KeyCode::F11) == 1)
 	{
 	{
 		TracerSingleton::get().setEnabled(!TracerSingleton::get().getEnabled());
 		TracerSingleton::get().setEnabled(!TracerSingleton::get().getEnabled());
-	}*/
+	}
 
 
 #if !PLAYER
 #if !PLAYER
 	static Vec2 mousePosOn1stClick = in.getMousePosition();
 	static Vec2 mousePosOn1stClick = in.getMousePosition();
@@ -310,10 +261,10 @@ Error MyApp::userMainLoop(Bool& quit, Second elapsedTime)
 			mover->moveLocalZ(moveDistance);
 			mover->moveLocalZ(moveDistance);
 		}
 		}
 
 
-		/* if(in.getKey(KeyCode::F12) == 1 && ANKI_ENABLE_TRACE)
+		if(in.getKey(KeyCode::F12) == 1 && ANKI_ENABLE_TRACE)
 		{
 		{
 			TracerSingleton::get().setEnabled(!TracerSingleton::get().getEnabled());
 			TracerSingleton::get().setEnabled(!TracerSingleton::get().getEnabled());
-		}*/
+		}
 
 
 		const Vec2 velocity = in.getMousePosition() - mousePosOn1stClick;
 		const Vec2 velocity = in.getMousePosition() - mousePosOn1stClick;
 		in.moveCursor(mousePosOn1stClick);
 		in.moveCursor(mousePosOn1stClick);