added Timer module to py bindings

Victor-Haefner · Jun 12, 2024 · b4849ea · b4849ea
1 parent 1758ab2
commit b4849ea
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 3 deletions.
diff --git a/src/core/scripting/VRPyMath.cpp b/src/core/scripting/VRPyMath.cpp
@@ -592,6 +592,7 @@ PyObject* VRPyLine::intersect(VRPyLine* self, PyObject *args) {
 
 // expression bindings
 
+simpleVRPyType(Timer, New_ptr);
 simplePyType(Expression, New_named_ptr);
 simplePyType(MathExpression, New_named_ptr);
 simplePyType(TSDF, VRPyTSDF::New );
@@ -758,6 +759,13 @@ PyMethodDef VRPyDatarow::methods[] = {
     {NULL}  /* Sentinel */
 };
 
+PyMethodDef VRPyTimer::methods[] = {
+    {"start", PyWrap( Timer, start, "start timer", void ) },
+    {"stop", PyWrap( Timer, stop, "stop timer", double ) },
+    {"reset", PyWrap( Timer, reset, "reset timer", void ) },
+    {NULL}  /* Sentinel */
+};
+
 PyMethodDef VRPyExpression::methods[] = {
     {"set", PyWrap2( Expression, set, "Set expression", void, string ) },
     {"segment", PyWrap2( Expression, segment, "Build tree structure", void ) },

diff --git a/src/core/scripting/VRPyMath.h b/src/core/scripting/VRPyMath.h
@@ -15,6 +15,7 @@
 #include "core/math/OSGMathFwd.h"
 #include "core/utils/xml.h"
 #include "core/utils/VRSpreadsheet.h"
+#include "core/utils/VRTimer.h"
 #include <OpenSG/OSGMatrix.h>
 #include <OpenSG/OSGLine.h>
 
@@ -113,6 +114,10 @@ struct VRPyLine : VRPyBaseT<OSG::Line> {
     static PyObject* pos(VRPyLine* self);
     static PyObject* dir(VRPyLine* self);
 };
+
+struct VRPyTimer : VRPyBaseT<OSG::VRTimer> {
+    static PyMethodDef methods[];
+};
 
 struct VRPyExpression : VRPyBaseT<OSG::Expression> {
     static PyMethodDef methods[];

diff --git a/src/core/scripting/VRSceneGlobals.cpp b/src/core/scripting/VRSceneGlobals.cpp
@@ -83,6 +83,7 @@ PyMethodDef VRSceneGlobals::methods[] = {
 	{"getSky", (PyCFunction)VRSceneGlobals::getSky, METH_NOARGS, "Get sky module" },
 	{"getSoundManager", (PyCFunction)VRSceneGlobals::getSoundManager, METH_NOARGS, "Get sound manager module" },
 	{"getFrame", (PyCFunction)VRSceneGlobals::getFrame, METH_NOARGS, "Get current frame number" },
+	{"getFPS", (PyCFunction)VRSceneGlobals::getFPS, METH_NOARGS, "Get current fps" },
 	{"getScript", (PyCFunction)VRSceneGlobals::getScript, METH_VARARGS, "Get python script by name" },
 	{"importScene", (PyCFunction)VRSceneGlobals::importScene, METH_VARARGS, "Import scene" },
 	{"getActiveCamera", (PyCFunction)VRSceneGlobals::getActiveCamera, METH_NOARGS, "Get active camera" },
@@ -124,6 +125,10 @@ PyObject* VRSceneGlobals::getFrame(VRSceneGlobals* self) {
     return PyInt_FromLong(VRGlobals::CURRENT_FRAME);
 }
 
+PyObject* VRSceneGlobals::getFPS(VRSceneGlobals* self) {
+    return PyFloat_FromDouble(VRGlobals::FRAME_RATE.fps);
+}
+
 PyObject* VRSceneGlobals::getActiveCamera(VRSceneGlobals* self) {
     return VRPyTypeCaster::cast( VRScene::getCurrent()->getActiveCamera() );
 }

diff --git a/src/core/scripting/VRSceneGlobals.h b/src/core/scripting/VRSceneGlobals.h
@@ -43,6 +43,7 @@ class VRSceneGlobals: public VRPyBase {
 		static PyObject* getSky(VRSceneGlobals* self);
 		static PyObject* getSoundManager(VRSceneGlobals* self);
 		static PyObject* getFrame(VRSceneGlobals* self);
+		static PyObject* getFPS(VRSceneGlobals* self);
 		static PyObject* getScript(VRSceneGlobals* self, PyObject *args);
 		static PyObject* importScene(VRSceneGlobals* self, PyObject *args);
 		static PyObject* getActiveCamera(VRSceneGlobals* self);

diff --git a/src/core/scripting/VRSceneModules.cpp b/src/core/scripting/VRSceneModules.cpp
@@ -342,6 +342,7 @@ void VRSceneModules::setup(VRScriptManager* sm, PyObject* pModVR) {
 #ifndef WITHOUT_LAPACKE_BLAS
     sm->registerModule<VRPyPCA>("PCA", pModVR, 0, "Math");
 #endif
+    sm->registerModule<VRPyTimer>("Timer", pModVR, 0, "Math");
     sm->registerModule<VRPyPID>("PID", pModVR, 0, "Math");
     sm->registerModule<VRPyPatch>("Patch", pModVR, 0, "Math");
 

diff --git a/src/core/utils/VRTimer.cpp b/src/core/utils/VRTimer.cpp
@@ -7,6 +7,7 @@
 #endif
 
 using namespace std;
+using namespace OSG;
 
 VRTimer::VRTimer() { start(); }
 VRTimerPtr VRTimer::create() { return VRTimerPtr(new VRTimer()); }

diff --git a/src/core/utils/VRTimer.h b/src/core/utils/VRTimer.h
@@ -5,6 +5,8 @@
 #include <string>
 #include "core/utils/VRUtilsFwd.h"
 
+namespace OSG {
+
 class VRTimer {
     private:
         struct timer {
@@ -32,4 +34,6 @@ class VRTimer {
         static double getBeacon(std::string);
 };
 
+}
+
 #endif // VRTIMER_H_INCLUDED
diff --git a/src/core/utils/VRUtilsFwd.h b/src/core/utils/VRUtilsFwd.h
@@ -11,9 +11,8 @@
 ptrTemplateFwd(VRCallbackWrapper, VRCallbackStrWrapper, std::string);
 ptrTemplateFwd(VRCallbackWrapper, VRCallbackPyWrapper, PyObject*);
 
-ptrFwd(VRTimer);
-
 namespace OSG {
+    ptrFwd(VRTimer);
     ptrFwd(VRVisualLayer);
     ptrFwd(VRProgress);
     ptrFwd(VREncryption);

diff --git a/src/core/utils/system/VRSystem.cpp b/src/core/utils/system/VRSystem.cpp
@@ -316,7 +316,7 @@ void doFrameSleep(double tFrame, double fps) {
     // efficient sleep
     double precisionBuffer = 0;//1.5;
     if (sT-precisionBuffer > 0) {
-        VRTimer timer;
+        OSG::VRTimer timer;
         timer.start();
         duration<double> T((sT-precisionBuffer)*1000);
         std::this_thread::sleep_for(T);