Text archives Help

---

Author: bigler
Date: Fri Apr 28 10:13:26 2006
New Revision: 1020

Modified:
   trunk/Model/Groups/CMakeLists.txt
   trunk/SwigInterface/manta.i
   trunk/SwigInterface/wxManta.py
   trunk/commandlines
   trunk/fox/dm_demo/dm_demo.cc
Log:

Model/Groups/CMakeLists.txt

  You really should compile KDTreeLoaderIW.cc.  Not sure why it was
  commented out.
  
SwigInterface/manta.i

  Removed GLXImageDisplay.  Changed GLXDrawable typedef to Window to
  conform with the OpenGLDisplay API.

SwigInterface/wxManta.py
fox/dm_demo/dm_demo.cc

  Use OpenGLDisplay instead of GLXImageDisplay.

commandlines

  Added command line to run disco shader.


Modified: trunk/Model/Groups/CMakeLists.txt
==============================================================================
--- trunk/Model/Groups/CMakeLists.txt   (original)
+++ trunk/Model/Groups/CMakeLists.txt   Fri Apr 28 10:13:26 2006
@@ -20,7 +20,7 @@
      Groups/KDTree.h
      Groups/KDTreeLoader.cc
      Groups/KDTreeLoader.h
-     #Groups/KDTreeLoaderIW.cc
+     Groups/KDTreeLoaderIW.cc
      Groups/KDTreeLoaderIW.h
      Groups/KDTree2.cc
      Groups/KDTree2.h

Modified: trunk/SwigInterface/manta.i
==============================================================================
--- trunk/SwigInterface/manta.i (original)
+++ trunk/SwigInterface/manta.i Fri Apr 28 10:13:26 2006
@@ -177,19 +177,17 @@
 
 ///////////////////////////////////////////////////////
 // ImageDisplay
-typedef int GLXDrawable;
+typedef int Window;
 
 %{
 #include <Interface/ImageDisplay.h>
 #include <Engine/Display/SyncDisplay.h>
 #include <Engine/Display/OpenGLDisplay.h>
-#include <Engine/Display/GLXImageDisplay.h>
 %}
 
 %include <Interface/ImageDisplay.h>
 %include <Engine/Display/SyncDisplay.h>
 %include <Engine/Display/OpenGLDisplay.h>
-%include <Engine/Display/GLXImageDisplay.h>
 
 
 

Modified: trunk/SwigInterface/wxManta.py
==============================================================================
--- trunk/SwigInterface/wxManta.py      (original)
+++ trunk/SwigInterface/wxManta.py      Fri Apr 28 10:13:26 2006
@@ -80,7 +80,7 @@
 
         # Image display.
         use_stereo = False
-        display = manta_new( GLXImageDisplay( use_stereo, 
self.frame.GetHandle() ) )
+        display = manta_new( OpenGLDisplay( None, self.frame.GetHandle() ) )
 
         # Create the camera.
         camera = self.engine.createCamera("pinhole(-eye 3 3 2 -lookat 0 0 
0.3 -up 0 0 1 -fov 60)")

Modified: trunk/commandlines
==============================================================================
--- trunk/commandlines  (original)
+++ trunk/commandlines  Fri Apr 28 10:13:26 2006
@@ -1,2 +1,3 @@
 ./manta -np 8 -res 1000x1000 -scene "primtest(box -texscale 20 -material 
checker)" -camera "pinhole(-eye 0 0 8 -lookat 0 0 0 -up 0 1 0 -fov 17)" 
-shadows noshadows
 ~/manta -np 1 -scene "BARTReader(-filename smalltest.aff)"
+bin/manta -res 300x300 -scene "lib/libscene_boeing777.so( -file 
/home/bigler/manta/data/models/shape0.v3c1 -normal)" -stack 
lib/libstack_disco.so -rays 3 -kernel 5

Modified: trunk/fox/dm_demo/dm_demo.cc
==============================================================================
--- trunk/fox/dm_demo/dm_demo.cc        (original)
+++ trunk/fox/dm_demo/dm_demo.cc        Fri Apr 28 10:13:26 2006
@@ -40,7 +40,7 @@
 
 #include <X11/Xlib.h>
 
-#include <Engine/Display/GLXImageDisplay.h>
+#include <Engine/Display/OpenGLDisplay.h>
 #include <Model/Cameras/PinholeCamera.h>
 
 #include <FManta/FMantaWindow.h>
@@ -149,7 +149,7 @@
 
   // Setup the manta pipeline.
   MantaInterface *manta_interface = 0;
-  GLXImageDisplay *glx_image_display = 0;
+  OpenGLDisplay *glx_image_display = 0;
   
   try {
     

---

• [MANTA] r1020 - in trunk: . Model/Groups SwigInterface fox/dm_demo, bigler, 04/28/2006

---

Archive powered by MHonArc 2.6.16.