|
From: <yx...@us...> - 2010-12-17 00:22:05
|
Revision: 235
http://simspark.svn.sourceforge.net/simspark/?rev=235&view=rev
Author: yxu
Date: 2010-12-17 00:21:59 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
multi-threads works! (do we really need mutex?!)
Modified Paths:
--------------
trunk/spark/plugin/imageperceptor/imagerender.cpp
trunk/spark/spark/spark.rb
Modified: trunk/spark/plugin/imageperceptor/imagerender.cpp
===================================================================
--- trunk/spark/plugin/imageperceptor/imagerender.cpp 2010-12-17 00:21:40 UTC (rev 234)
+++ trunk/spark/plugin/imageperceptor/imagerender.cpp 2010-12-17 00:21:59 UTC (rev 235)
@@ -164,6 +164,6 @@
// unbind FBO
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
#endif
-// mRenderServer->SetCamera(oldCamera);
+ mRenderServer->SetCamera(oldCamera);
}
Modified: trunk/spark/spark/spark.rb
===================================================================
--- trunk/spark/spark/spark.rb 2010-12-17 00:21:40 UTC (rev 234)
+++ trunk/spark/spark/spark.rb 2010-12-17 00:21:59 UTC (rev 235)
@@ -283,7 +283,7 @@
simulationServer = sparkGetSimulationServer()
if (simulationServer != nil)
- simulationServer.setMultiThreads(false);
+ simulationServer.setMultiThreads(true);
simulationServer.initControlNode('oxygen/AgentControl','AgentControl')
# set auto speed adjust mode.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|