Text archives Help
- From: abe@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r834 - in trunk/Model: Cameras MiscObjects
- Date: Tue, 10 Jan 2006 11:06:35 -0700 (MST)
Author: abe
Date: Tue Jan 10 11:06:35 2006
New Revision: 834
Modified:
trunk/Model/Cameras/PinholeCamera.h
trunk/Model/MiscObjects/CuttingPlane.h
Log:
Fixed initializer order in constructors.
M MiscObjects/CuttingPlane.h
M Cameras/PinholeCamera.h
Modified: trunk/Model/Cameras/PinholeCamera.h
==============================================================================
--- trunk/Model/Cameras/PinholeCamera.h (original)
+++ trunk/Model/Cameras/PinholeCamera.h Tue Jan 10 11:06:35 2006
@@ -1,4 +1,5 @@
+
#ifndef Manta_Model_PinholeCamera_h
#define Manta_Model_PinholeCamera_h
@@ -15,7 +16,7 @@
class PinholeCamera : public Camera {
public:
PinholeCamera( const Point &eye_, const Point &lookat_, const Vector
&up_, Real fov_ ) :
- eye( eye_ ), lookat( lookat_ ), up( up_ ), hfov( fov_ ),
stereo_offset( 0.0 ) { setup(); }
+ eye( eye_ ), lookat( lookat_ ), up( up_ ), stereo_offset( 0.0 ), hfov(
fov_ ) { setup(); }
PinholeCamera(const vector<string>& args);
virtual ~PinholeCamera();
virtual void makeRays(RayPacket&) const;
Modified: trunk/Model/MiscObjects/CuttingPlane.h
==============================================================================
--- trunk/Model/MiscObjects/CuttingPlane.h (original)
+++ trunk/Model/MiscObjects/CuttingPlane.h Tue Jan 10 11:06:35 2006
@@ -26,9 +26,11 @@
public:
CuttingPlane( const Point &point_, const Vector &normal_, Object
*internal_object_ ) :
- initial_point( point_ ), plane_point( point_ ),
- plane_normal( normal_ ), internal_object( internal_object_ ),
- movement_scale( 1.0 ) { }
+ internal_object( internal_object_ ),
+ movement_scale( 1.0 ),
+ initial_point( point_ ),
+ plane_point( point_ ),
+ plane_normal( normal_ ) { }
// Preprocess the internal object and compute its bounds.
void preprocess( const PreprocessContext &context );
- [MANTA] r834 - in trunk/Model: Cameras MiscObjects, abe, 01/10/2006
Archive powered by MHonArc 2.6.16.