[simspark-svn] SF.net SVN: simspark:[295] trunk/rsgedit

[<yx...@us...>]

Revision: 295
          http://simspark.svn.sourceforge.net/simspark/?rev=295&view=rev
Author:   yxu
Date:     2012-02-24 13:25:11 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
fix rsgedit

Modified Paths:
--------------
    trunk/rsgedit/CMakeLists.txt
    trunk/rsgedit/src/main.cpp
    trunk/rsgedit/src/mainframe.cpp
    trunk/rsgedit/src/simspark.cpp
    trunk/rsgedit/src/simspark.h
    trunk/rsgedit/src/sparkglrender.cpp

Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt	2012-02-24 13:24:49 UTC (rev 294)
+++ trunk/rsgedit/CMakeLists.txt	2012-02-24 13:25:11 UTC (rev 295)
@@ -9,7 +9,7 @@
 find_package(Boost REQUIRED thread COMPONENTS date_time)
 find_package(ODE REQUIRED)
 find_package(OpenGL REQUIRED)
-set(wxWidgets_USE_LIBS  gl adv)
+set(wxWidgets_USE_LIBS  core gl adv)
 find_package(wxWidgets REQUIRED)
 include( ${wxWidgets_USE_FILE} )
 

Modified: trunk/rsgedit/src/main.cpp
===================================================================
--- trunk/rsgedit/src/main.cpp	2012-02-24 13:24:49 UTC (rev 294)
+++ trunk/rsgedit/src/main.cpp	2012-02-24 13:25:11 UTC (rev 295)
@@ -63,7 +63,7 @@
          );
     wxYield();
 
-    mSpark = shared_ptr<SimSpark>(new SimSpark("../../"));
+    mSpark = shared_ptr<SimSpark>(new SimSpark());
 
     if (! mSpark->Init(argc, reinterpret_cast<char**>(argv)))
         {

Modified: trunk/rsgedit/src/mainframe.cpp
===================================================================
--- trunk/rsgedit/src/mainframe.cpp	2012-02-24 13:24:49 UTC (rev 294)
+++ trunk/rsgedit/src/mainframe.cpp	2012-02-24 13:25:11 UTC (rev 295)
@@ -610,11 +610,9 @@
         }
 
     // go through the next simulation cycle
-    sim->AdvanceTime(tDeltaSec);
+	sim->SetSimStep(tDeltaSec);
+    sim->Cycle();
 
-    shared_ptr<SimControlNode> inputCtr;
-    sim->Cycle(inputCtr);
-
     // refresh the display
     RefreshProperties();
 
@@ -646,7 +644,6 @@
 
     sim->SetSimStep(SIM_SIMSTEP);
     sim->Init(0,0);
-    sim->SetAutoTimeMode(false);
 
     mLastFPSUpdate = 0.0;
 }

Modified: trunk/rsgedit/src/simspark.cpp
===================================================================
--- trunk/rsgedit/src/simspark.cpp	2012-02-24 13:24:49 UTC (rev 294)
+++ trunk/rsgedit/src/simspark.cpp	2012-02-24 13:25:11 UTC (rev 295)
@@ -37,8 +37,8 @@
 
 std::ostringstream* SimSpark::mLogStream = 0;
 
-SimSpark::SimSpark(const string& relPathPrefix) :
-    Spark(relPathPrefix)
+SimSpark::SimSpark() :
+    Spark()
 {
     mState = S_PAUSED;
 }

Modified: trunk/rsgedit/src/simspark.h
===================================================================
--- trunk/rsgedit/src/simspark.h	2012-02-24 13:24:49 UTC (rev 294)
+++ trunk/rsgedit/src/simspark.h	2012-02-24 13:25:11 UTC (rev 295)
@@ -28,7 +28,7 @@
 class SimSpark : public spark::Spark
 {
 public:
-    SimSpark(const std::string& relPathPrefix);
+    SimSpark();
     ~SimSpark();
 
     /** called once after Spark finished it's init */

Modified: trunk/rsgedit/src/sparkglrender.cpp
===================================================================
--- trunk/rsgedit/src/sparkglrender.cpp	2012-02-24 13:24:49 UTC (rev 294)
+++ trunk/rsgedit/src/sparkglrender.cpp	2012-02-24 13:25:11 UTC (rev 295)
@@ -111,7 +111,7 @@
         }
 
     mCamera->SetViewport(0,0,width,height);
-    mRenderServer->Render();
+    mRenderServer->Render(true);
     RenderSelection();
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.