Text archives Help

---

Author: sparker
Date: Thu Jun 30 14:53:53 2005
New Revision: 417

Added:
   branches/newpipeline/Engine/Control/Manta.cc
      - copied unchanged from r416, 
branches/newpipeline/Engine/Control/RTRT.cc
   branches/newpipeline/Engine/Control/Manta.h
      - copied unchanged from r416, branches/newpipeline/Engine/Control/RTRT.h
Removed:
   branches/newpipeline/Core/Color/sub.mk
   branches/newpipeline/Core/Exceptions/sub.mk
   branches/newpipeline/Core/Math/sub.mk
   branches/newpipeline/Core/Util/sub.mk
   branches/newpipeline/Core/sub.mk
   branches/newpipeline/Engine/Control/RTRT.cc
   branches/newpipeline/Engine/Control/RTRT.h
   branches/newpipeline/Engine/Control/sub.mk
   branches/newpipeline/Engine/Display/sub.mk
   branches/newpipeline/Engine/IdleModes/sub.mk
   branches/newpipeline/Engine/ImageTraversers/sub.mk
   branches/newpipeline/Engine/LoadBalancers/sub.mk
   branches/newpipeline/Engine/PixelSamplers/sub.mk
   branches/newpipeline/Engine/Renderers/sub.mk
   branches/newpipeline/Engine/Shadows/sub.mk
   branches/newpipeline/Engine/sub.mk
   branches/newpipeline/Image/sub.mk
   branches/newpipeline/Interface/sub.mk
   branches/newpipeline/Model/AmbientLights/sub.mk
   branches/newpipeline/Model/Backgrounds/sub.mk
   branches/newpipeline/Model/Cameras/sub.mk
   branches/newpipeline/Model/Groups/sub.mk
   branches/newpipeline/Model/Instances/sub.mk
   branches/newpipeline/Model/Lights/sub.mk
   branches/newpipeline/Model/Materials/sub.mk
   branches/newpipeline/Model/MiscObjects/sub.mk
   branches/newpipeline/Model/Primitives/sub.mk
   branches/newpipeline/Model/Readers/sub.mk
   branches/newpipeline/Model/TexCoordMappers/sub.mk
   branches/newpipeline/Model/sub.mk
   branches/newpipeline/Readers/BART/sub.mk
   branches/newpipeline/Readers/sub.mk
   branches/newpipeline/StandAlone/sub.mk
   branches/newpipeline/UserInterface/sub.mk
   branches/newpipeline/scenes/sub.mk
   branches/newpipeline/sub.mk
Modified:
   branches/newpipeline/Engine/Control/CMakeLists.txt
   branches/newpipeline/Interface/MantaInterface.h
   branches/newpipeline/UserInterface/CMakeLists.txt
   branches/newpipeline/UserInterface/XWindowUI.cc
Log:
Don't need sub.mk's any longer
A little more progress on the pipeline branch...


Modified: branches/newpipeline/Engine/Control/CMakeLists.txt
==============================================================================
--- branches/newpipeline/Engine/Control/CMakeLists.txt  (original)
+++ branches/newpipeline/Engine/Control/CMakeLists.txt  Thu Jun 30 14:53:53 
2005
@@ -1,6 +1,6 @@
 
 SET (Manta_Control_SRCS
-     Control/RTRT.cc
-     Control/RTRT_register.cc
+     Control/Manta.cc
+     Control/Manta_register.cc
      Control/Worker.cc
      )

Modified: branches/newpipeline/Interface/MantaInterface.h
==============================================================================
--- branches/newpipeline/Interface/MantaInterface.h     (original)
+++ branches/newpipeline/Interface/MantaInterface.h     Thu Jun 30 14:53:53 
2005
@@ -10,6 +10,7 @@
 #include <sgi_stl_warnings_on.h>
 
 namespace Manta {
+  class Pipeline;
   class SetupCallback;
 
   class MantaInterface {
@@ -27,18 +28,17 @@
     virtual void changeNumWorkers(int) = 0;
     virtual TValue<int>& numWorkers() = 0;
 
-    // Free-run rendering
+    // Main control loop
     enum RenderingMode {
       FreeRun,
       SingleFrame
     };
     virtual void beginRendering(RenderingMode mode, bool blockUntilFinished) 
= 0;
-    virtual void blockUntilFinished() = 0;
-    virtual void finish() = 0;
+    virtual void triggerSingleFrame() = 0;
+    virtual void finishRendering(bool blockUntilFinished) = 0;
 
-    // Frame-at-a-time interface
-    virtual void beginSingleFrameRendering();
-    virtual void triggerSingleFrame(...) = 0;
+    // Pipelines
+    virtual Pipeline* createPipeline() = 0;
 
     // Query functions
 #if 0

Modified: branches/newpipeline/UserInterface/CMakeLists.txt
==============================================================================
--- branches/newpipeline/UserInterface/CMakeLists.txt   (original)
+++ branches/newpipeline/UserInterface/CMakeLists.txt   Thu Jun 30 14:53:53 
2005
@@ -1,4 +1,4 @@
 
-ADD_LIBRARY (Manta_UserInterface PromptUI.cc XWindowUI.cc)
+ADD_LIBRARY (Manta_UserInterface XWindowUI.cc)
 TARGET_LINK_LIBRARIES(Manta_UserInterface Manta_Core Manta_Interface)
 TARGET_LINK_LIBRARIES(Manta_UserInterface ${X11_LIBRARIES})

Modified: branches/newpipeline/UserInterface/XWindowUI.cc
==============================================================================
--- branches/newpipeline/UserInterface/XWindowUI.cc     (original)
+++ branches/newpipeline/UserInterface/XWindowUI.cc     Thu Jun 30 14:53:53 
2005
@@ -12,6 +12,7 @@
 #include <Core/Math/Trig.h>
 #include <Core/Thread/Runnable.h>
 #include <Core/Thread/Thread.h>
+#include <Core/Util/NotFinished.h>
 
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
@@ -313,7 +314,8 @@
 void XWindowUI::changeResolution(int, int, int channel,
                                  int new_xres, int new_yres)
 {
-  engine->changeResolution(channel, new_xres, new_yres, true);
+  //engine->changeResolution(channel, new_xres, new_yres, true);
+  NOT_FINISHED("changeResolution");
 }
 
 void XWindowUI::printhelp(ostream& out)
@@ -444,16 +446,20 @@
     Thread::exitAll(1);
   } else {
     quitting = true;
-    engine->finish();
+    engine->finishRendering(false);
   }
 }
 
 void XWindowUI::autoview(unsigned int, unsigned long, int channel)
 {
+#if 0
   Camera* camera = engine->getCamera(channel);
   engine->addTransaction("autoview",
                                  Callback::create(camera, &Camera::autoview,
                                                   autoview_fov));
+#else
+  NOT_FINISHED("getCamera not finished");
+#endif
 }
 
 void XWindowUI::mouse_fov(unsigned int, unsigned int,
@@ -480,10 +486,13 @@
     else
       scale += 1;
 
+    NOT_FINISHED("getCamera not finished");
+#if 0
     Camera* camera = engine->getCamera(channel);
     engine->addTransaction("scale fov",
                                    Callback::create(camera, 
&Camera::scaleFOV,
                                                     scale));
+#endif
 
     ias.last_x = mouse_x;
     ias.last_y = mouse_y;
@@ -506,10 +515,13 @@
     trans.initWithRotation(to, ias.rotate_from);
     ias.rotate_from = to;
 
+    NOT_FINISHED("getCamera not finished");
+#if 0
     Camera* camera = engine->getCamera(channel);
     engine->addTransaction("rotate",
                                    Callback::create(camera, 
&Camera::transform,
                                                     trans, Camera::LookAt));
+#endif
     ias.last_x = mouse_x;
     ias.last_y = mouse_y;
   }
@@ -529,10 +541,13 @@
     double ymotion = -double(ias.last_y-mouse_y)/window->yres;
     Vector translation(xmotion*translate_speed, ymotion*translate_speed, 0);
 
+    NOT_FINISHED("getCamera not finished");
+#if 0
     Camera* camera = engine->getCamera(channel);
     engine->addTransaction("translate",
                                    Callback::create(camera, 
&Camera::translate,
                                                     translation));
+#endif
     ias.last_x = mouse_x;
     ias.last_y = mouse_y;
   }
@@ -557,10 +572,13 @@
       scale=ymotion;
     scale *= dolly_speed;
 
+    NOT_FINISHED("getCamera not finished");
+#if 0
     Camera* camera = engine->getCamera(channel);
     engine->addTransaction("dolly",
                                    Callback::create(camera, &Camera::dolly,
                                                     scale));
+#endif
     ias.last_x = mouse_x;
     ias.last_y = mouse_y;
   }

---

• [MANTA] r417 - in branches/newpipeline: . Core Core/Color Core/Exceptions Core/Math Core/Util Engine Engine/Control Engine/Display Engine/IdleModes Engine/ImageTraversers Engine/LoadBalancers Engine/PixelSamplers Engine/Renderers Engine/Shadows Image Interface Model Model/AmbientLights Model/Backgrounds Model/Cameras Model/Groups Model/Instances Model/Lights Model/Materials Model/MiscObjects Model/Primitives Model/Readers Model/TexCoordMappers Readers Readers/BART StandAlone UserInterface scenes, sparker, 06/30/2005

---

Archive powered by MHonArc 2.6.16.