Commit d198debd authored by maesius's avatar maesius

--no commit message

--no commit message
parent d6686279
......@@ -22,21 +22,21 @@
*---------------------------------------------------------------------------*/
LrCamera::LrCamera()
:
m_m_position(),
m_m_vertical(),
m_m_direction(),
m_m_angleX(),
m_m_angleY()
m_position(),
m_vertical(),
m_direction(),
m_angleX(),
m_angleY()
{
}
LrCamera::LrCamera(const LrCamera &source)
:
m_m_position(source.m_m_position),
m_m_vertical(source.m_m_vertical),
m_m_direction(source.m_m_direction),
m_m_angleX(source.m_m_angleX),
m_m_angleY(source.m_m_angleY)
m_position(source.m_position),
m_vertical(source.m_vertical),
m_direction(source.m_direction),
m_angleX(source.m_angleX),
m_angleY(source.m_angleY)
{
}
......@@ -46,13 +46,13 @@ LrCamera::clone() const
return new LrCamera(*this);
}
LrCamera::LrCamera(const LrPoint &m_position, const LrVector &m_vertical, const LrVector &m_direction, real m_angleX, real m_angleY)
LrCamera::LrCamera(const LrPoint &m_position, const LrVector &m_vertical, const LrVector &m_direction, Real m_angleX, Real m_angleY)
:
m_m_position(m_position),
m_m_vertical(m_vertical),
m_m_direction(m_direction),
m_m_angleX(m_angleX),
m_m_angleY(m_angleY)
m_position(m_position),
m_vertical(m_vertical),
m_direction(m_direction),
m_angleX(m_angleX),
m_angleY(m_angleY)
{
}
......@@ -70,11 +70,11 @@ LrCamera::operator = (const LrCamera &source)
if (this == &source)
return *this;
m_m_position = source.m_m_position;
m_m_vertical = source.m_m_vertical;
m_m_direction = source.m_m_direction;
m_m_angleX = source.m_m_angleX;
m_m_angleY = source.m_m_angleY;
m_position = source.m_position;
m_vertical = source.m_vertical;
m_direction = source.m_direction;
m_angleX = source.m_angleX;
m_angleY = source.m_angleY;
return *this;
}
......@@ -86,11 +86,11 @@ LrCamera::operator = (const LrCamera &source)
bool
operator == (const LrCamera &lhs, const LrCamera &rhs)
{
return (lhs.m_m_position == rhs.m_m_position)
&& (lhs.m_m_vertical == rhs.m_m_vertical)
&& (lhs.m_m_direction == rhs.m_m_direction)
&& (lhs.m_m_angleX == rhs.m_m_angleX)
&& (lhs.m_m_angleY == rhs.m_m_angleY);
return (lhs.m_position == rhs.m_position)
&& (lhs.m_vertical == rhs.m_vertical)
&& (lhs.m_direction == rhs.m_direction)
&& (lhs.m_angleX == rhs.m_angleX)
&& (lhs.m_angleY == rhs.m_angleY);
}
bool
......@@ -106,61 +106,61 @@ operator != (const LrCamera &lhs, const LrCamera &rhs)
LrPoint
LrCamera::getM_position() const
{
return m_m_position;
return m_position;
}
void
LrCamera::setM_position(const LrPoint &m_position)
{
m_m_position = m_position;
m_position = m_position;
}
LrVector
LrCamera::getM_vertical() const
{
return m_m_vertical;
return m_vertical;
}
void
LrCamera::setM_vertical(const LrVector &m_vertical)
{
m_m_vertical = m_vertical;
m_vertical = m_vertical;
}
LrVector
LrCamera::getM_direction() const
{
return m_m_direction;
return m_direction;
}
void
LrCamera::setM_direction(const LrVector &m_direction)
{
m_m_direction = m_direction;
m_direction = m_direction;
}
real
Real
LrCamera::getM_angleX() const
{
return m_m_angleX;
return m_angleX;
}
void
LrCamera::setM_angleX(real m_angleX)
LrCamera::setM_angleX(Real m_angleX)
{
m_m_angleX = m_angleX;
m_angleX = m_angleX;
}
real
Real
LrCamera::getM_angleY() const
{
return m_m_angleY;
return m_angleY;
}
void
LrCamera::setM_angleY(real m_angleY)
LrCamera::setM_angleY(Real m_angleY)
{
m_m_angleY = m_angleY;
m_angleY = m_angleY;
}
......
......@@ -16,6 +16,7 @@
#include "LrPoint.h"
#include "LrVector.h"
#include "LrRay.h"
class LrCamera
{
......@@ -27,7 +28,7 @@ public:
LrCamera();
LrCamera(const LrCamera &source);
LrCamera * clone() const;
LrCamera(const LrPoint &m_position, const LrVector &m_vertical, const LrVector &m_direction, real m_angleX, real m_angleY);
LrCamera(const LrPoint &m_position, const LrVector &m_vertical, const LrVector &m_direction, Real m_angleX, Real m_angleY);
virtual ~LrCamera();
......@@ -54,27 +55,27 @@ public:
LrVector getM_direction() const;
void setM_direction(const LrVector &m_direction);
real getM_angleX() const;
void setM_angleX(real m_angleX);
Real getM_angleX() const;
void setM_angleX(Real m_angleX);
real getM_angleY() const;
void setM_angleY(real m_angleY);
Real getM_angleY() const;
void setM_angleY(Real m_angleY);
//
// *****************
LrRay getRay(real u, real v) const;
LrRay getRay(Real u, Real v) const;
private:
// data
// ****
LrPoint m_m_position;
LrVector m_m_vertical;
LrVector m_m_direction;
real m_m_angleX;
real m_m_angleY;
LrPoint m_position;
LrVector m_vertical;
LrVector m_direction;
Real m_angleX;
Real m_angleY;
};
#endif
......
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