Browse Source

bring in sync with new lens system

David Rose 24 years ago
parent
commit
a146f98569

+ 3 - 11
pandaapp/src/stitchviewer/stitchImageConverter.cxx

@@ -26,7 +26,7 @@
 #include <textureTransition.h>
 #include <textureTransition.h>
 #include <chancfg.h>
 #include <chancfg.h>
 #include <camera.h>
 #include <camera.h>
-#include <perspectiveProjection.h>
+#include <perspectiveLens.h>
 #include <frustum.h>
 #include <frustum.h>
 
 
 StitchImageConverter::
 StitchImageConverter::
@@ -55,16 +55,8 @@ void StitchImageConverter::
 setup_camera(const RenderRelation &camera_arc) {
 setup_camera(const RenderRelation &camera_arc) {
   PT(Camera) cam = DCAST(Camera, camera_arc.get_child());
   PT(Camera) cam = DCAST(Camera, camera_arc.get_child());
 
 
-  Frustumf frust;
-  frust._t = 0.5;
-  frust._b = -0.5;
-  frust._l = -0.5;
-  frust._r = 0.5;
-  frust._fnear = 0.5;
-  frust._ffar = 2.0;
-
-  PerspectiveProjection proj(frust);
-  cam->set_projection(proj);
+  PT(Lens) lens = new PerspectiveLens;
+  cam->set_lens(lens);
 }
 }
 
 
 bool StitchImageConverter::
 bool StitchImageConverter::

+ 1 - 1
pandaapp/src/stitchviewer/stitchImageVisualizer.cxx

@@ -207,7 +207,7 @@ setup() {
       group_node_index < chanConfig.get_num_groups();
       group_node_index < chanConfig.get_num_groups();
       group_node_index++) {
       group_node_index++) {
     DisplayRegion *dr = chanConfig.get_dr(group_node_index);
     DisplayRegion *dr = chanConfig.get_dr(group_node_index);
-    dr->get_camera()->set_near_far(1.0, 10000.0);
+    dr->get_camera()->get_lens()->set_near_far(1.0, 10000.0);
     new RenderRelation(_render, chanConfig.get_group_node(group_node_index));
     new RenderRelation(_render, chanConfig.get_group_node(group_node_index));
     
     
   }
   }