Update Demos

NelsonBrandao · Jun 18, 2014 · 5b0573e · 5b0573e
1 parent 84cd416
commit 5b0573e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/BilliardsBlur/BilliardsBlur.cpp b/BilliardsBlur/BilliardsBlur.cpp
@@ -281,7 +281,7 @@ void BilliardsBlurScene::initScene( InitialCameraData& camera_data )
     m_context["output_buffer_f3"]->setBuffer( m_context->createBuffer(RT_BUFFER_OUTPUT, RT_FORMAT_FLOAT3, 1, 1));
 
 	// Setup camera
-	camera_data = InitialCameraData( make_float3( 10.3f, 10.0f, -10.0f ), // eye
+	camera_data = InitialCameraData( make_float3( 12.3f, 8.0f, 0.8f ), // eye
 									 make_float3( 0.5f, 0.3f,  1.0f ),   // lookat
 									 make_float3( 0.0f, 1.0f,  0.0f ),  // up
 									              40.0f );             // vfov

diff --git a/CannonBall/CannonBall.cpp b/CannonBall/CannonBall.cpp
@@ -298,7 +298,7 @@ void CannonBall::createGeometry()
 		optix::GeometryGroup box_group = m_context->createGeometryGroup();
 		box_group->setChildCount( 1u );
 		box_group->setChild( 0, gi );
-		box_group->setAcceleration( m_context->createAcceleration("NoAccel","NoAccel") );
+		box_group->setAcceleration( m_context->createAcceleration("Bvh","Bvh") );
 
 		// Transform
 		optix::Transform box_transform = m_context->createTransform();
@@ -384,9 +384,7 @@ void CannonBall::trace( const RayGenCameraData& camera_data )
 	if(m_animate){
 		// Update PhysX	
 		if (gScene) 
-		{ 
-		   StepPhysX(); 
-		} 
+			StepPhysX();
 
 		// Update Geometry
 		updateGeometry();
@@ -403,10 +401,7 @@ void CannonBall::StepPhysX()
 { 
 	gScene->simulate(myTimestep);        
 
-	while(!gScene->fetchResults() )     
-	{
-		// do something useful        
-	}
+	while(!gScene->fetchResults() ){}
 } 
 
 void CannonBall::updateGeometry()

diff --git a/OptixPlusPhysx.sln b/OptixPlusPhysx.sln
@@ -7,6 +7,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CannonBall", "CannonBall\Ca
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BilliardsBlur", "BilliardsBlur\BilliardsBlur.vcxproj", "{C4C0A30E-023C-4494-83AF-6EC1499ED3DE}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B1DB0BA7-CBA1-48D4-AEA6-34F124D5CF46}"
+	ProjectSection(SolutionItems) = preProject
+		Performance1.psess = Performance1.psess
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -29,4 +34,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 EndGlobal
diff --git a/OptixPlusPhysx/Main.cpp b/OptixPlusPhysx/Main.cpp
@@ -609,7 +609,6 @@ void createActors()
 			sphereActor->setAngularDamping(0.2f);
 			sphereActor->setLinearDamping(0.01f);
 			sphereActor->setMass(1.0f+(i/4.0f));
-			//actor->setLinearVelocity(physx::PxVec3(0,0,-10.0f)); 
 
 			gScene->addActor(*sphereActor);