[cgkit-commits] cgkit2 viewer.py,1.1,1.2

[Matthias B. <mb...@us...>]

Update of /cvsroot/cgkit/cgkit2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25273

Modified Files:
	viewer.py 
Log Message:
Some options can now also be set in the scene as a global

Index: viewer.py
===================================================================
RCS file: /cvsroot/cgkit/cgkit2/viewer.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** viewer.py	12 Dec 2004 17:20:13 -0000	1.1
--- viewer.py	19 Dec 2004 21:32:11 -0000	1.2
***************
*** 22,26 ****
  # $Id$
  
! """Viewer tool."""
  
  import sys, os, os.path
--- 22,40 ----
  # $Id$
  
! """Viewer tool.
! 
! Global options:
! 
! background     Background color (must be anything that can be passed to the
!                vec4 constructor).
! fullscreen     Boolean indicating if a full screen view should be used
! stereo         Stereo setting (None, "vsplit", "glstereo")
! eyedistance    Eye distance for stereo display
! polygonmode    Drawing mode ("fill", "line", "point")
! navigationmode Selects the navigation mode ("maya", "max", "softimage")
! resolution     (width, height)  (aspect is ignored)
! fps            Framerate
! camera         Specify camera to be used
! """
  
  import sys, os, os.path
***************
*** 98,130 ****
          self.cgkit_joysticks = []
  
!         Sopt = self.options.stereo
!         if Sopt==None:
!             self.stereo_mode = 0
!         elif Sopt.lower()=="vsplit":
!             self.stereo_mode = 1
!         elif Sopt.lower()=="glstereo":
!             self.stereo_mode = 2
!         else:
!             raise ValueError, "Unknown stereo mode: '%s'"%Sopt
! 
!         Popt = self.options.polygon_mode
!         if Popt==None or Popt.lower()=="fill":
!             self.polygon_mode = 2
!         elif Popt.lower()=="line":
!             self.polygon_mode = 1
!         elif Popt.lower()=="point":
!             self.polygon_mode = 0
!         else:
!             raise ValueError, "Unknown polygon mode. '%s'"%Popt
! 
!         Nopt = self.options.navigation_mode
!         if Nopt==None or Nopt.lower()=="maya":
!             self.navigation_mode = 1
!         elif Nopt.lower()=="max":
!             self.navigation_mode = 0
!         elif Nopt.lower()=="softimage":
!             self.navigation_mode = 2
!         else:
!             raise ValueError, "Unknown navigation mode. '%s'"%Nopt
  
          self.keydict = {
--- 112,119 ----
          self.cgkit_joysticks = []
  
!         scene = getScene()
!         scene.setGlobal("stereo", self.options.stereo)
!         scene.setGlobal("polygonmode", self.options.polygon_mode)
!         scene.setGlobal("navigationmode", self.options.navigation_mode)
  
          self.keydict = {
***************
*** 248,260 ****
          self.renderer = GLRenderInstance()
  
  
      # action
      def action(self):
-         # Create a camera control component
-         CameraControl(cam=self.cam, mode=self.navigation_mode)
- 
          # Display the scene using pygame...
          scene = getScene()
          timer = scene.timer()
  
          # Get options...
--- 237,277 ----
          self.renderer = GLRenderInstance()
  
+     # setOptionsFromGlobals
+     def setOptionsFromGlobals(self):
+         Tool.setOptionsFromGlobals(self)
+ 
+         scene = getScene()
+         self.options.full_screen = scene.getGlobal("fullscreen", self.options.full_screen)
+ 
+         self.options.eye_distance = float(scene.getGlobal("eyedistance", self.options.eye_distance))
+ 
+         # Check the stereo option and initialize the variable "stereo_mode"
+         Sopt = scene.getGlobal("stereo", None)
+         self.stereo_mode = self.translateKeyWordOpt(Sopt,
+                                 { None:0, "vsplit":1, "glstereo":2 },
+                                 "Unknown stereo mode: '%s'")
+ 
+         # Check the polygon mode option
+         Popt = scene.getGlobal("polygonmode", "fill")
+         self.polygon_mode = self.translateKeyWordOpt(Popt,
+                                 { None:2, "point":0, "line":1, "fill":2 },
+                                 "Unknown polygon mode: '%s'")
+ 
+         # Check the navigationmode option
+         Nopt = scene.getGlobal("navigationmode", "maya")
+         self.navigation_mode = self.translateKeyWordOpt(Nopt,
+                             { None:1, "max":0, "maya":1, "softimage":2 },
+                             "Unknown navigation mode: '%s'")
+         
+ 
  
      # action
      def action(self):
          # Display the scene using pygame...
          scene = getScene()
          timer = scene.timer()
+         
+         # Create a camera control component
+         CameraControl(cam=self.cam, mode=self.navigation_mode)
  
          # Get options...
***************
*** 304,309 ****
  
              clk.tick(fps)
! #            cnt+=1
! #            if cnt==100:
  #                print "fps: %d"%clk.get_fps()
  #                print "Virtual time:",timer.time, "Real time:",timer.clock
--- 321,326 ----
  
              clk.tick(fps)
!             cnt+=1
! #            if cnt==25:
  #                print "fps: %d"%clk.get_fps()
  #                print "Virtual time:",timer.time, "Real time:",timer.clock
***************
*** 464,468 ****
          renderer.polygon_mode = self.polygon_mode  # 0=Point 1=Line 2=Fill
          renderer.stereo_mode = self.stereo_mode
!         renderer.clearcol = vec4(0.5, 0.5, 0.6, 0)
  
          V = cam.viewTransformation()
--- 481,485 ----
          renderer.polygon_mode = self.polygon_mode  # 0=Point 1=Line 2=Fill
          renderer.stereo_mode = self.stereo_mode
!         renderer.clearcol = vec4(scene.getGlobal("background", vec4(0.5,0.5,0.6,0)))
  
          V = cam.viewTransformation()