add preliminary ray tracing test (ray-sphere placeholder on CPU)

2013-05-25 01:45:43 -07:00
parent a92223890f
commit a3559b3c92
6 changed files with 261 additions and 15 deletions
--- a/Demos3/GpuDemos/main_opengl3core.cpp
+++ b/Demos3/GpuDemos/main_opengl3core.cpp
@@ -76,6 +76,8 @@ GpuDemo::CreateFunc* allDemos[]=
 //		GpuConvexScene::MyCreateFunc,

 	//ConcaveSphereScene::MyCreateFunc,
+	GpuRaytraceScene::MyCreateFunc,
+
 	GpuBoxPlaneScene::MyCreateFunc,
 	GpuConvexPlaneScene::MyCreateFunc,

@@ -601,7 +603,7 @@ int main(int argc, char* argv[])
 		ci.m_gui = gui;
 		ci.m_instancingRenderer->init();
 		ci.m_instancingRenderer->InitShaders();
-
+		ci.m_primRenderer = &prim;
 //		render.init();

 		demo->initPhysics(ci);