From 460d9bda5f03c5da29864fa9dd160848097be51b Mon Sep 17 00:00:00 2001 From: TravisBot <> Date: Sat, 6 Jan 2018 11:36:50 +0000 Subject: [Travis] Rebuilding documentation --- classyage_1_1Camera.html | 159 +++++++++++++++-------------------------------- 1 file changed, 51 insertions(+), 108 deletions(-) (limited to 'classyage_1_1Camera.html') diff --git a/classyage_1_1Camera.html b/classyage_1_1Camera.html index a2992d24..d66ed4d1 100644 --- a/classyage_1_1Camera.html +++ b/classyage_1_1Camera.html @@ -108,7 +108,6 @@ $(document).ready(function(){initNavTree('classyage_1_1Camera.html','');});
Public Member Functions | -Private Attributes | List of all members
yage::Camera Class Reference
@@ -120,24 +119,17 @@ $(document).ready(function(){initNavTree('classyage_1_1Camera.html','');});

Public Member Functions

 Camera (int screen_width=1280, int screen_height=720) + Creates a camera that looks onto the scene. More...
  -void update (GlslProgram &program) -  +void update (Shader &program) + Updates the camera matrix value in the shader program that is passed to it. More...
+  void move (const glm::vec2 &direction) + Moves the camera using a two-dimensional displacement vector to describe the movement. More...
  - - - - - - - - - - - - + + +

-Private Attributes

bool update_matrix_ = true
 
float scale_ = 1
 
glm::vec2 position_
 
glm::mat4 camera_matrix_
 
glm::mat4 ortho_matrix_
 
void zoom (float factor)
 Zooms the camera by an incremental amount. More...
 

Constructor & Destructor Documentation

@@ -164,6 +156,16 @@ Private Attributes
+

Creates a camera that looks onto the scene.

+

The screen width and screen height should be the current size of the window that the camera is being used on so that is functions correctly.

+
Parameters
+ + + +
screen_widthCurrent screen width of the Window.
screen_heightCurrent screen height of the Window.
+
+
+

Member Function Documentation

@@ -181,122 +183,63 @@ Private Attributes
+

Moves the camera using a two-dimensional displacement vector to describe the movement.

+
Parameters
+ + +
directionTwo-dimensional vector to describe the displacement of the camera.
+
+
+
- +
- +
void yage::Camera::update (GlslProgram & Shader &  program)
-
-
-

Member Data Documentation

- -
-
- - - - - -
- - - - -
glm::mat4 yage::Camera::camera_matrix_
- 		-private
-
- -
-
- -
-
- - - - - -
- - - - -
glm::mat4 yage::Camera::ortho_matrix_
- 		-private
-
- -
-
- -
-
- - - - - -
- - - - -
glm::vec2 yage::Camera::position_
- 		-private
-
+

Updates the camera matrix value in the shader program that is passed to it.

+

This must be a parameter P in the shader for this function to work.

+
Parameters
+ + +
programShader program to make changes to.
+
+
+
Todo:
Make this function more general to be able to be able to use any parametre in then shader as the camera matrix and not make it dependent on it being P.
- +
- - - - - -
- + + + + +
float yage::Camera::scale_ = 1void yage::Camera::zoom (float factor)
- 		-private
-
-
- -
-
- - - - - -
- - - - -
bool yage::Camera::update_matrix_ = true
- 		-private
-
+

Zooms the camera by an incremental amount.

+
Parameters
+ + +
factorFactor by which the camera should zoom. This can also be a negative number for the camera to zoom out.
+
+
@@ -310,7 +253,7 @@ Private Attributes