Finished camera for now
This commit is contained in:
parent
06614dd1b0
commit
a5ab0c9adb
5 changed files with 46 additions and 16 deletions
|
@ -13,8 +13,6 @@
|
|||
|
||||
namespace oglu
|
||||
{
|
||||
class Object;
|
||||
|
||||
/**
|
||||
* @brief A camera object in 3D space.
|
||||
*
|
||||
|
@ -88,7 +86,7 @@ namespace oglu
|
|||
*
|
||||
* @param[in] target An object to target
|
||||
*/
|
||||
void LookAt(const Object& target);
|
||||
void LookAt(const Transformable& target);
|
||||
|
||||
/**
|
||||
* @brief Gets the projection matrix of the camera.
|
||||
|
|
|
@ -239,23 +239,23 @@ namespace oglu
|
|||
*
|
||||
* @returns A pointer to an array of floats
|
||||
*/
|
||||
const float* GetPosition();
|
||||
const float* GetPosition() const;
|
||||
|
||||
/**
|
||||
* @brief Get rotation as a matrix.
|
||||
*
|
||||
* @returns A pointer to a 4x4 matrix
|
||||
*/
|
||||
const float* GetRotation();
|
||||
const float* GetRotation() const;
|
||||
|
||||
/**
|
||||
* @brief Get scaling as a 3D vector.
|
||||
*
|
||||
* @returns A pointer to an array of floats
|
||||
*/
|
||||
const float* GetScaling();
|
||||
const float* GetScaling() const;
|
||||
|
||||
private:
|
||||
protected:
|
||||
// TODO: Separate translation, rotation and scaling matrices.
|
||||
// Combine them only when the user wants the transformation matrix
|
||||
float* position; ///< Position vector
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue