Commit b76da264 authored by Ellen Dekkers's avatar Ellen Dekkers

TransformNode: set value of 2d scale factor for 2d objects rendered in ortho mode

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@10463 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 1b88d3d7
......@@ -333,11 +333,6 @@ void
TransformNode::
ortho2DMode(GLState& _state)
{
// return;
// double currentNear = _state.near_plane();
// double currentFar = _state.far_plane();
// std::cout << "currentNear =" << currentNear << ", currentFar = " << currentFar << std::endl;
// set ortho 2D mode in glstate
int width = _state.viewport_width();
int height = _state.viewport_height();
......@@ -357,7 +352,6 @@ ortho2DMode(GLState& _state)
Vec3d(0.0,0.0,1.0),
Vec3d(0.0,-1.0,0.0)); // flip up direction (y-axis) s.t. opengl coordsys matches image coordsys
// _state.translate( 0.5*(width-1), 0.5*(height-1), 0);
_state.scale(scaleFactor2D_, scaleFactor2D_, 1.0);
// move image center to window center
......
......@@ -185,7 +185,7 @@ public:
void set2D(bool _2d){is2DObject_ = _2d;};
void ortho2DMode(GLState& _state);
void update2DOffset(ACG::Vec2d _offset){offset_ += _offset;};
void scale2D(double _scale){scaleFactor2D_ += _scale;};
void scale2D(double _scale){scaleFactor2D_ = _scale;};
void setImageDimensions(ACG::Vec2i _dim){imageDimensions_ = _dim;};
private:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment