From 29785b8a928d464b46cb5c977adf100ee966be6b Mon Sep 17 00:00:00 2001 From: Nicholas Bottone Date: Tue, 12 Dec 2023 22:48:02 -0500 Subject: Add gravity and velocity properties to SceneGlobalData and ScenePrimitive --- src/utils/scenedata.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/utils/scenedata.h b/src/utils/scenedata.h index e60d0f0..c6bae08 100644 --- a/src/utils/scenedata.h +++ b/src/utils/scenedata.h @@ -41,6 +41,7 @@ struct SceneGlobalData { float kd; // Diffuse term float ks; // Specular term float kt; // Transparency; used for extra credit (refraction) + glm::vec4 gravity; // Acceleration due to gravity (as a 4d vector) }; // Struct which contains raw parsed data fro a single light @@ -80,8 +81,10 @@ struct SceneCameraData { glm::vec4 pos; glm::vec4 look; glm::vec4 up; + glm::vec4 over; float heightAngle; // The height angle of the camera in RADIANS + float depthAngle; // The depth angle of the camera in RADIANS float aperture; // Only applicable for depth of field float focalLength; // Only applicable for depth of field @@ -157,6 +160,7 @@ struct ScenePrimitive { PrimitiveType type; SceneMaterial material; std::string meshfile; // Used for triangle meshes + glm::vec4 velocity; // Current velocity of the primitive }; // Struct which contains data for a transformation. -- cgit v1.2.3-70-g09d2