[Csp-commits] svn:csp r1280 - in trunk/CSP/CSPSim: . Include Source

[<sv...@ww...>]

Author: delta
Date: 2004-10-04 04:19:29 -0700 (Mon, 04 Oct 2004)
New Revision: 1280

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/InputEvent.h
   trunk/CSP/CSPSim/Source/InputEvent.cpp
Log:
Fix for the recording of the input stream. It will need more work on the sampling value though.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1280

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2004-10-04 01:28:08 UTC (rev 1279)
+++ trunk/CSP/CSPSim/CHANGES.current	2004-10-04 11:19:29 UTC (rev 1280)
@@ -1,6 +1,10 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2004-10-04: delta
+  * Fix for the recording of the input stream. It will need more work
+    on the sampling value though.
+    
 2004-10-03: delta
   * Updated vcproj. Building CSPSimDLL now buils others libs (SimCore, 
     SpatialIndex) according to the build mode.

Modified: trunk/CSP/CSPSim/Include/InputEvent.h
===================================================================
--- trunk/CSP/CSPSim/Include/InputEvent.h	2004-10-04 01:28:08 UTC (rev 1279)
+++ trunk/CSP/CSPSim/Include/InputEvent.h	2004-10-04 11:19:29 UTC (rev 1280)
@@ -35,8 +35,7 @@
 
 class Handle {
 protected:
-	//simdata::SimTime m_EventTime;
-	float m_EventTime;
+	simdata::SimTime m_EventTime;
 	static const float m_Sampling;
 public:
 	Handle():

Modified: trunk/CSP/CSPSim/Source/InputEvent.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/InputEvent.cpp	2004-10-04 01:28:08 UTC (rev 1279)
+++ trunk/CSP/CSPSim/Source/InputEvent.cpp	2004-10-04 11:19:29 UTC (rev 1280)
@@ -48,11 +48,11 @@
 
 bool Save::operator()(SDL_Event& event) {
 	bool result = SDL_PollEvent(&event) != 0;
-	float d2 = CSPSim::theSim->getElapsedTime();
+	simdata::SimTime d2 = CSPSim::theSim->getElapsedTime();
 	if (d2 - m_EventTime > m_Sampling) {
 		m_EventTime = d2;
 		m_of.write(reinterpret_cast<char*>(&event),sizeof(SDL_Event));
-		m_of.write(reinterpret_cast<char*>(&m_EventTime),sizeof(float));
+		m_of.write(reinterpret_cast<char*>(&m_EventTime),sizeof(simdata::SimTime));
 	}
 	return result;
 }
@@ -71,10 +71,11 @@
 	SDL_Event e;
 	bool result = SDL_PollEvent(&e) != 0;
 	if (e.type != SDL_QUIT && (e.type != SDL_KEYDOWN || e.key.keysym.sym != SDLK_ESCAPE)) {
-		float d2 = CSPSim::theSim->getElapsedTime();
+		simdata::SimTime d2 = CSPSim::theSim->getElapsedTime();
 		if (d2 - m_EventTime > 2*m_Sampling) {
 			m_if.read(reinterpret_cast<char*>(&event),sizeof(SDL_Event));
-			m_if.read(reinterpret_cast<char*>(&m_EventTime),sizeof(float));
+			m_if.read(reinterpret_cast<char*>(&m_EventTime),sizeof(simdata::SimTime));
+			result = true;
 		}
 	} else {
 		event = e;