Changeset 2629 for GTP/trunk/Lib/Vis/Preprocessing/src/Camera.h

Timestamp:

01/23/08 00:21:50 (16 years ago)

Author:

bittner

Message:

commit after merge with vlastimil

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Camera.h (modified) (4 diffs)

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

@@ -4 +4 @@
 #include "Vector3.h"
 #include "AxisAlignedBox3.h"
+#include "ktbconf.h"
 
 namespace GtpVisibilityPreprocessor {
@@ -31 +32 @@
   }
 
-  Camera(int width, int height) {
+  Camera(int width, int height, float fieldOfView = 90.f) {
     mWidth = width;
     mHeight = height;
-    mFovy = 90.0f*(float)M_PI/180.0f;
+    mFovy = fieldOfView*(float)M_PI/180.0f;
   }
-
   
   void Precompute() {
@@ -87 +87 @@
 
   bool
+  SnapImage2(std::string filename,
+             RayCaster *raycaster,
+             AxisAlignedBox3 &bbox,
+             SceneGraph *sceneGraph
+             );
+  
+  bool
   SnapImagePacket(std::string filename,
                   RayCaster *raycaster,
@@ -92 +99 @@
                   SceneGraph *sceneGraph
                   );
-  
+
+  bool
+  SnapImagePacket2(std::string filename,
+                  RayCaster *raycaster,
+                  AxisAlignedBox3 &bbox,
+                  SceneGraph *sceneGraph
+                  );
+
   void SetupRay(Ray &ray, const int x, const int y);