Changeset 1151 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

07/25/06 18:20:07 (18 years ago)

Author:

mattausch

Message:

worded on dll loading

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GlRenderer.h (modified) (5 diffs)
• RssPreprocessor.cpp (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (1 diff)
• main.cpp (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.h

@@ -78 +78 @@
 
 public:
-  ObjectContainer mObjects;
-   
-  Vector3 mViewPoint;
-  Vector3 mViewDirection;
-
-  int timerId;
-  bool mUseFalseColors;
-  bool mUseForcedColors;
-
-  HaltonSequence halton;
-  
-  int mFrame;
-  bool mWireFrame;
-  
-  bool mDetectEmptyViewSpace;
-  bool mSnapErrorFrames;
-
-  bool mUseGlLists;
-  
-  string mSnapPrefix;
-
-  KdTree *mKdTree;
-
-  //QWaitCondition mRenderingFinished;
-  
-  vector<OcclusionQuery *> mOcclusionQueries;
-  
+
   GlRenderer(SceneGraph *sceneGraph,
                          ViewCellsManager *viewcells,
                          KdTree *tree);
   
+  GlRenderer() {}
+
   virtual ~GlRenderer();
 
@@ -140 +116 @@
 
   int GetId(int r, int g, int b) const;
+
+  inline const bool GetSnapErrorFrames() { return mSnapErrorFrames; }
+  inline const string GetSnapPrefix() { return mSnapPrefix; }
+
+  inline void SetSnapErrorFrames(bool snapframes) { mSnapErrorFrames = snapframes; }
+  inline void SetSnapPrefix(const string &pref) { mSnapPrefix = pref; }
+
+protected:
+
+
+  vector<OcclusionQuery *> mOcclusionQueries;
+
+  ObjectContainer mObjects;
+   
+  Vector3 mViewPoint;
+  Vector3 mViewDirection;
+
+  int timerId;
+  bool mUseFalseColors;
+  bool mUseForcedColors;
+
+  HaltonSequence halton;
+  
+  int mFrame;
+  bool mWireFrame;
+  
+  bool mDetectEmptyViewSpace;
+  bool mSnapErrorFrames;
+
+  bool mUseGlLists;
+  
+  string mSnapPrefix;
+
+  KdTree *mKdTree;
+
 };
 
@@ -147 +158 @@
 {
 
-//Q_OBJECT
 public:
+
 GlRendererBuffer(SceneGraph *sceneGraph,
                                  ViewCellsManager *viewcells,
@@ -259 +270 @@
 /** Abstract class for implmenenting a gl render widget.
 */
-class GlRenderWidget
+class GlRendererWidget: public GlRenderer
 {
 public:
         
-        GlRenderWidget(SceneGraph *sceneGraph, ViewCellsManager *vcm, KdTree *kdTree):
-          mSceneGraph(sceneGraph), mViewCellsManager(vcm), mKdTree(kdTree)
-        {
-        }
-
-        
-        GlRenderWidget() {}
-
-    virtual ~GlRenderWidget() {}
+        GlRendererWidget(SceneGraph *sceneGraph, ViewCellsManager *vcm, KdTree *kdTree):
+          GlRenderer(sceneGraph, vcm, kdTree)
+        {}
+
+    GlRendererWidget() {}
+
+    virtual ~GlRendererWidget() {}
 
         //virtual void Create() {}
@@ -285 +294 @@
 };
 
+//extern GlRendererWidget *rendererWidget;
+
 };
 

GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp

@@ -841 +841 @@
                 sprintf(buf, "snap/i-%02d-", mPass);
 
-                renderer->mSnapPrefix = buf;
+                renderer->SetSnapPrefix(buf);
           }
           else
@@ -847 +847 @@
                 sprintf(buf, "snap/r-%02d-", mPass);
 
-                renderer->mSnapPrefix = buf;
+                renderer->SetSnapPrefix(buf);
           }
 
-          renderer->mSnapErrorFrames = true;
+          renderer->SetSnapErrorFrames(true);
         }
 

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -1289 +1289 @@
         sort(mViewCells.begin(), mViewCells.end(), ViewCell::SmallerPvs);
 
-        int start = mViewCells.size() * minValid;
-        int end = mViewCells.size() * maxValid;
-
-        for (int i = 0; i < mViewCells.size(); ++ i)
+        int start = (int)(mViewCells.size() * minValid);
+        int end = (int)(mViewCells.size() * maxValid);
+
+        for (int i = 0; i < (int)mViewCells.size(); ++ i)
         {
                 mViewCells[i]->SetValid(i >= start && i <= end);

GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp

@@ +1 @@
+#include <windows.h>
+#include <stdio.h>
+#include <crtdbg.h>
+
 #include "SamplingPreprocessor.h"
 #include "VssPreprocessor.h"
@@ -19 +23 @@
 #define USE_EXE_PATH false
 
-#include <crtdbg.h>
 
 using namespace GtpVisibilityPreprocessor;
 
 Preprocessor *preprocessor = NULL;
-GlRenderWidget *renderWidget = NULL;
+GlRendererWidget *rendererWidget = NULL;
+
+// DLL function signature
+typedef GlRendererWidget *(*importFunction)();
+
+int LoadMyDll()
+{
+        importFunction LoadRenderWidget;
+        
+    // Load DLL file
+        HINSTANCE hinstLib = LoadLibrary("QtRenderer.dll");
+        
+        if (hinstLib == NULL) 
+        {
+                cout << "ERROR: unable to load DLL\n";
+                return 1;
+        }
+
+        // Get function pointer
+    LoadRenderWidget = (importFunction)GetProcAddress(hinstLib, "LoadRenderWidget");
+        
+        if (LoadRenderWidget == NULL) 
+        {
+                cout << "ERROR: unable to find DLL function\n";
+                return 1;
+        }
+
+        // load the render window
+    rendererWidget = LoadRenderWidget();
+
+        return 0;
+}
+
 
 
 void Cleanup()
 {
-        DEL_PTR(renderWidget);
+        DEL_PTR(rendererWidget);
         DEL_PTR(preprocessor);
 
@@ -40 +75 @@
 void DisplayWidget()
 {
+        if (!rendererWidget)
+                LoadMyDll();
+
         // note matt: capsulate qt dependent code as good as possible
-        renderWidget = 
-                new GlRenderWidget(preprocessor->mSceneGraph, 
+        /*new GlRendererWidget(preprocessor->mSceneGraph, 
                                                    preprocessor->mViewCellsManager, 
                                                    preprocessor->mKdTree);
-
-        renderWidget->Show();
+*/
+        rendererWidget->Show();
 
 #if QT_ENABLED