Text archives Help

---

Author: abe
Date: Thu Feb  9 21:12:01 2006
New Revision: 924

Modified:
   trunk/fox/afr_demo/Engine/Control/AFRPipeline.cc
   trunk/fox/afr_demo/Engine/ImageTraversers/GSTAFRImageTraverser.cc
   trunk/fox/afr_demo/Model/Cameras/AFRCamera.h
   trunk/fox/afr_demo/Model/Cameras/AFRPinholeCamera.cc
   trunk/fox/afr_demo/Model/Cameras/AFRPinholeCamera.h
   trunk/fox/afr_demo/StandAlone/afr.cc
Log:


Added create method to AFRPinholeCamera.
M    afr_demo/Model/Cameras/AFRPinholeCamera.cc
M    afr_demo/Model/Cameras/AFRPinholeCamera.h
M    afr_demo/Model/Cameras/AFRCamera.h

Removed check for exisiting component when registering a new component.
M    afr_demo/Engine/Control/AFRPipeline.cc
M    afr_demo/Engine/ImageTraversers/GSTAFRImageTraverser.cc

Registered "pinhole" as AFRPinholeCamera
M    afr_demo/StandAlone/afr.cc


Modified: trunk/fox/afr_demo/Engine/Control/AFRPipeline.cc
==============================================================================
--- trunk/fox/afr_demo/Engine/Control/AFRPipeline.cc    (original)
+++ trunk/fox/afr_demo/Engine/Control/AFRPipeline.cc    Thu Feb  9 21:12:01 
2006
@@ -1313,9 +1313,10 @@
 
 void AFRPipeline::registerComponent(const string& name, CameraCreator fun)
 {
-  CameraMapType::iterator iter = cameras.find(name);
-  if(iter != cameras.end())
-    throw IllegalValue<string>("Duplicate Camera component", name);
+  // CameraMapType::iterator iter = cameras.find(name);
+  // if(iter != cameras.end()) {
+  //  throw IllegalValue<string>("Duplicate Camera component", name);
+  // }
   cameras[name] = fun;
 }
 

Modified: trunk/fox/afr_demo/Engine/ImageTraversers/GSTAFRImageTraverser.cc
==============================================================================
--- trunk/fox/afr_demo/Engine/ImageTraversers/GSTAFRImageTraverser.cc   
(original)
+++ trunk/fox/afr_demo/Engine/ImageTraversers/GSTAFRImageTraverser.cc   Thu 
Feb  9 21:12:01 2006
@@ -58,7 +58,8 @@
   sourcetgrads( false ),
   afterupdateonly( false ),
   masters_exempt( false ),
-  outputstats( false )
+  outputstats( false ),
+  samples_done( 0 )
   //streamlock( "streamlock" ),
 
 {

Modified: trunk/fox/afr_demo/Model/Cameras/AFRCamera.h
==============================================================================
--- trunk/fox/afr_demo/Model/Cameras/AFRCamera.h        (original)
+++ trunk/fox/afr_demo/Model/Cameras/AFRCamera.h        Thu Feb  9 21:12:01 
2006
@@ -84,7 +84,6 @@
     
     virtual ~AFRCamera() { };
 
-    static Camera* create(const vector<string>& args) { return 
AFRPinholeCamera::create( args ); }
 
     
///////////////////////////////////////////////////////////////////////////
     // Render stack method.

Modified: trunk/fox/afr_demo/Model/Cameras/AFRPinholeCamera.cc
==============================================================================
--- trunk/fox/afr_demo/Model/Cameras/AFRPinholeCamera.cc        (original)
+++ trunk/fox/afr_demo/Model/Cameras/AFRPinholeCamera.cc        Thu Feb  9 
21:12:01 2006
@@ -27,6 +27,20 @@
 {
 }
 
+Camera* AFRPinholeCamera::create(const vector<string>& args) {
+
+  Camera *camera = PinholeCamera::create( args );
+  
+  // 60 is only hardcoded because there isn't a getFov method on the camera.
+  AFRPinholeCamera *afr_camera = new AFRPinholeCamera( camera->getPosition(),
+                                                       camera->getLookAt(),
+                                                       camera->getUp(),
+                                                       60 );
+  delete camera;  
+  return afr_camera;
+}
+
+
 void AFRPinholeCamera::setup()
 {
   int i, j, k;

Modified: trunk/fox/afr_demo/Model/Cameras/AFRPinholeCamera.h
==============================================================================
--- trunk/fox/afr_demo/Model/Cameras/AFRPinholeCamera.h (original)
+++ trunk/fox/afr_demo/Model/Cameras/AFRPinholeCamera.h Thu Feb  9 21:12:01 
2006
@@ -16,7 +16,9 @@
   public:
     AFRPinholeCamera(const vector<string>& args);
     AFRPinholeCamera( const Point &eye_, const Point &lookat_, const Vector 
&up_, Real fov_ );
+
     static Camera* create(const vector<string>& args);
+
     virtual ~AFRPinholeCamera();
     virtual Point project(const Point &point) const;  // project a 3D point 
to the camera image plane
     virtual void writeToFile(FILE *fp) const;

Modified: trunk/fox/afr_demo/StandAlone/afr.cc
==============================================================================
--- trunk/fox/afr_demo/StandAlone/afr.cc        (original)
+++ trunk/fox/afr_demo/StandAlone/afr.cc        Thu Feb  9 21:12:01 2006
@@ -215,8 +215,12 @@
     bool stereo = false;
     bool compute_bb_camera = false;
 
-    // Parse command line args.
+    
///////////////////////////////////////////////////////////////////////////
+    // Register afr components.
+    rtrt->registerComponent("pinhole", &AFRPinholeCamera::create);
     
+    
///////////////////////////////////////////////////////////////////////////
+    // Parse command line args.
     int argc = static_cast<int>(args.size());
     for(int i=0;i<argc;i++){
       string arg = args[i];

---

• [MANTA] r924 - in trunk/fox/afr_demo: Engine/Control Engine/ImageTraversers Model/Cameras StandAlone, abe, 02/09/2006

---

Archive powered by MHonArc 2.6.16.