ed/DuctTaped_GL
1
0
Fork 0
mirror of https://github.com/Ed94/DuctTaped_GL.git synced 2024-12-21 22:44:47 -08:00
Code Issues Packages Projects Releases Wiki Activity

Last bit of tape before turning assignment 1

Browse Source
This commit is contained in:
Edward R. Gonzalez 2020-02-26 19:00:45 -05:00
parent a12a99404e
commit 7dfb188fd2
20 changed files with 71 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Actions.hpp
View File

@ -257,6 +257,7 @@ namespace Actions
return returnRef; return returnRef;
} }
// TODO: Not yet working
template<typename ObjectType, typename FunctionType, typename... ActionParams> template<typename ObjectType, typename FunctionType, typename... ActionParams>
IAction* Request_AAction(const ObjectType& _objectRef, const function< FunctionType>& _actionToQueue, const ActionParams&... _paramsForAction) IAction* Request_AAction(const ObjectType& _objectRef, const function< FunctionType>& _actionToQueue, const ActionParams&... _paramsForAction)
{ {
@ -274,11 +275,11 @@ namespace Actions
{ {
ActionType* castedEntry = static_cast<ActionType*>(possibleAction->get()); ActionType* castedEntry = static_cast<ActionType*>(possibleAction->get());
if (castedEntry->IsSame(_actionToQueue, _paramsForAction...)) if (castedEntry->IsSame(_objectRef, _actionToQueue, _paramsForAction...))
{ {
return castedEntry; return castedEntry;
} }
else if (castedEntry->Used() && castedEntry->SameAction(_actionToQueue)) else if (castedEntry->Used() && castedEntry->SameAction(_actionToQueue) && castedEntry->SameObject(_objectRef))
{ {
castedEntry->ReInitalize(_paramsForAction...); castedEntry->ReInitalize(_paramsForAction...);
@ -286,16 +287,16 @@ namespace Actions
} }
} }
shared_ptr< IAction> newAction = make_shared< AAction<FunctionType, ActionParams...>>(_actionToQueue, _paramsForAction...); shared_ptr< IAction> newAction = make_shared< AAction_ObjectBound<ObjectType, FunctionType, ActionParams...>>(_actionToQueue, _paramsForAction...);
IAction* returnRef = newAction.get (); IAction* returnRef = newAction.get ();
aActions_Available.at(AActionID).push_front(newAction); aActions_Available.at(AActionID).push_front(newAction);
return returnRef; return returnRef;
} }
shared_ptr< IAction> newAction = make_shared< AAction<FunctionType, ActionParams...>>(_actionToQueue, _paramsForAction...); shared_ptr< IAction> newAction = make_shared< AAction_ObjectBound<ObjectType, FunctionType, ActionParams...>>(_actionToQueue, _paramsForAction...);
IAction* returnRef = newAction.get (); IAction* returnRef = newAction.get ();
aActions_Available.insert(std::make_pair(AActionID, Make_Managed_Actions())); aActions_Available.insert(std::make_pair(AActionID, Make_Managed_Actions()));

12
DGL/DGL_Entity.hpp
View File

@ -91,7 +91,7 @@ namespace DGL
transform = Translate(transform, position); transform = Translate(transform, position);
transform = Scale (transform, scale ); transform = Scale (transform, scale );
valueLoop += 0.31879f * _delta; valueLoop += 0.31879f * gFloat(_delta);
return; return;
} }
@ -232,9 +232,9 @@ namespace DGL
transform = CoordSpace(1.0f); transform = CoordSpace(1.0f);
transform = DGL::Translate(transform, position); transform = Translate(transform, position);
transform = DGL::Scale(transform, scale); transform = Scale(transform, scale);
return; return;
} }
@ -245,9 +245,9 @@ namespace DGL
transform = CoordSpace(1.0f); transform = CoordSpace(1.0f);
transform = DGL::Translate(transform, position); transform = Translate(transform, position);
transform = DGL::Scale(transform, scale); transform = Scale(transform, scale);
return; return;
} }
@ -281,7 +281,7 @@ namespace DGL
private: private:
//EEntityType type; // EEntityType type;
Vector3 position ; Vector3 position ;
Vector3 scale ; Vector3 scale ;

32
DGL/DGL_Model.hpp
View File

@ -3,7 +3,7 @@ Title : Ducktaped GL: Model
Author: Edward R. Gonzalez Author: Edward R. Gonzalez
Description: Description:
Allows the management of loading and buffer/rendering models from wavefront obj file sources.
*/ */
#pragma once #pragma once
@ -120,6 +120,8 @@ namespace DGL
if (normals.size() > 0) if (normals.size() > 0)
{ {
//generated.Normals.vec[index] = normals[index]; //generated.Normals.vec[index] = normals[index];
// Not using built in normals for now...
} }
} }
@ -157,11 +159,6 @@ namespace DGL
normal = GetCrossNormal(edge1, edge2); normal = GetCrossNormal(edge1, edge2);
//faces[faceIndex].Normals.vec[0] = vertexIndex1;
//faces[faceIndex].Normals.vec[1] = vertexIndex2;
//faces[faceIndex].Normals.vec[2] = vertexIndex3;
normals[vertexIndex1] += normal; normals[vertexIndex1] += normal;
normals[vertexIndex2] += normal; normals[vertexIndex2] += normal;
normals[vertexIndex3] += normal; normals[vertexIndex3] += normal;
@ -169,14 +166,6 @@ namespace DGL
for (int index = 0; index < normals.size(); index++) for (int index = 0; index < normals.size(); index++)
{ {
/*gFloat magnitude = 0.0f;
magnitude = normals[index].x + normals[index].y + normals[index].z;
normals[index].x /= magnitude;
normals[index].y /= magnitude;
normals[index].z /= magnitude;*/
normals[index] = GetDirection(normals[index]); normals[index] = GetDirection(normals[index]);
} }
} }
@ -201,6 +190,8 @@ namespace DGL
// Hardcoded to only do the verticies and normals for now... // Hardcoded to only do the verticies and normals for now...
void Buffer() void Buffer()
{ {
// Generate buffers
GenerateVertexBuffers(vertexArrayID , 1); GenerateVertexBuffers(vertexArrayID , 1);
GenerateBuffers (vertexBufferID , 1); GenerateBuffers (vertexBufferID , 1);
GenerateBuffers (normalBuffferID, 1); GenerateBuffers (normalBuffferID, 1);
@ -256,24 +247,11 @@ namespace DGL
} }
BindBuffer(EBufferTarget::VertexIndices, elementBufferID); BindBuffer(EBufferTarget::VertexIndices, elementBufferID);
BufferData(faces[0], gSize(faces.size() * sizeof(Face)), EBufferTarget::VertexIndices, EBufferUsage::StaticDraw); BufferData(faces[0], gSize(faces.size() * sizeof(Face)), EBufferTarget::VertexIndices, EBufferUsage::StaticDraw);
UnbindVertexArray(); // Unbind vertex array. UnbindVertexArray(); // Unbind vertex array.
/*for (int index = 0; index < verticies.size(); index++)
{
cout << "Vertex: " << verticies[index].x << ", " << verticies[index].y << ", " << ", " << verticies[index].z << endl;
}
for (int index = 0; index < verticies.size(); index++)
{
cout << "Normal: " << normals[index].x << ", " << normals[index].y << ", " << ", " << normals[index].z << endl;
}*/
} }
void Load() void Load()

9
DGL/DGL_Shader.hpp
View File

@ -1,3 +1,12 @@
/*
Title : Ducktaped GL: Shader
Author: Edward R. Gonzalez
Description:
All the wrappers for the openGL shader related and and implementation of a basic light and phong shader.
*/
#pragma once #pragma once
//DGL //DGL

8
DGL/DGL_Space.hpp
View File

@ -1,3 +1,11 @@
/*
Title : Ducktaped GL: Space
Author: Edward R. Gonzalez
Description:
Contains related functionality for dealing with 3D-Space, and viewing.
*/
#pragma once #pragma once
// GLM // GLM

15
DGL/DGL_Utilities.hpp
View File

@ -1,3 +1,12 @@
/*
Title : Ducktaped GL: Utilities
Author: Edward R. Gonzalez
Description:
The header with the general functionality for using glm/glfw/glew.
*/
#pragma once #pragma once
// GLFW, GLEW, GLM // GLFW, GLEW, GLM
@ -18,6 +27,7 @@
#include "Cpp_Alias.hpp" #include "Cpp_Alias.hpp"
namespace DGL namespace DGL
{ {
// Object Instances // Object Instances
@ -232,6 +242,11 @@ namespace DGL
return; return;
} }
void SetWindowHeader(Window* const _window, string _title)
{
glfwSetWindowTitle(_window, _title.c_str());
}
void SwapBuffers(Window* const _window) void SwapBuffers(Window* const _window)
{ {
glfwSwapBuffers(_window); glfwSwapBuffers(_window);

68
Execution.cpp
View File

@ -75,6 +75,7 @@ namespace Execution
using DGL::SetInputMode ; using DGL::SetInputMode ;
using DGL::SetPolygonMode ; using DGL::SetPolygonMode ;
using DGL::SetUniformVariable_MVA ; using DGL::SetUniformVariable_MVA ;
using DGL::SetWindowHeader ;
using DGL::SwapBuffers ; using DGL::SwapBuffers ;
using DGL::UseProgramShader ; using DGL::UseProgramShader ;
using DGL::TerminateGLFW ; using DGL::TerminateGLFW ;
@ -97,7 +98,6 @@ namespace Execution
enum class EModels enum class EModels
{ {
Bunny , Bunny ,
Cube ,
Eight , Eight ,
Gargoyle , Gargoyle ,
Hand , Hand ,
@ -111,34 +111,32 @@ namespace Execution
bool Exist = true; // Determines if the the execution should exit cycler. bool Exist = true; // Determines if the the execution should exit cycler.
TimeValDec CycleStart , // Snapshot of cycle loop start time. TimeValDec CycleStart , // Snapshot of cycle loop start time.
CycleEnd , // Snapshot of cycle loop end time. CycleEnd , // Snapshot of cycle loop end time.
DeltaTime , // Delta between last cycle start and end. DeltaTime , // Delta between last cycle start and end.
InputInterval = 1.0f / 144.0f, // Interval per second to complete the input process of the cycle. InputInterval = 1.0f / 144.0f, // Interval per second to complete the input process of the cycle.
PhysicsInterval = 1.0f / 144.0f, // Interval per second to complete the physics process of the cycle. PhysicsInterval = 1.0f / 144.0f, // Interval per second to complete the physics process of the cycle.
RenderInterval = 1.0f / 144.0f, // Interval per second to complete the render process of the cycle. RenderInterval = 1.0f / 144.0f ; // Interval per second to complete the render process of the cycle.
InputBuffer = 1.0f;
Window* DefaultWindow; // Default window to use for execution. Window* DefaultWindow; // Default window to use for execution.
double CursorX, CursorY; // Cursor axis position on the window. double CursorX, CursorY; // Cursor axis position on the window.
bool CursorOff = true, ShowLight = true; bool CursorOff = true,
ShowLight = true ;
gFloat CamMoveSpeed = 7.0f, // Rate at which the camera should move. gFloat CamMoveSpeed = 7.0f, // Rate at which the camera should move.
CamRotationSpeed = 27.0f ; // Rate at which the camera should rotate. CamRotationSpeed = 27.0f ; // Rate at which the camera should rotate.
TimeValDec InputDelta = 0.0, // Current delta since last input process. TimeValDec InputDelta = 0.0, // Current delta since last input process.
InputBufferDelta = 0.0,
PhysicsDelta = 0.0, // Current delta since last physics process. PhysicsDelta = 0.0, // Current delta since last physics process.
RenderDelta = 0.0 ; // Current delta since last render process. RenderDelta = 0.0 ; // Current delta since last render process.
ActionQueue ActionsToComplete; // Actions queue to run during the physics process of the cycle. ActionQueue ActionsToComplete; // Actions queue to run during the physics process of the cycle.
EModels CurrentModel = EModels::Cube; EModels CurrentModel = EModels::Bunny;
Model Bunny ("./Models/bunny.obj" ); Model Bunny ("./Models/bunny.obj" );
Model Cube ("./Models/blendercube2.obj");
Model Eight ("./Models/eight.obj" ); Model Eight ("./Models/eight.obj" );
Model Gargoyle ("./Models/gargoyle.obj" ); Model Gargoyle ("./Models/gargoyle.obj" );
Model Hand ("./Models/hand.obj" ); Model Hand ("./Models/hand.obj" );
@ -152,7 +150,6 @@ namespace Execution
Light_Basic Light ; // Hardcoded light. Rotates around object. Light_Basic Light ; // Hardcoded light. Rotates around object.
Entity_Basic ObjectToView; // Object that will be currently in the middle with the light source rotating. Entity_Basic ObjectToView; // Object that will be currently in the middle with the light source rotating.
string string
windowTitle = "Assignment 1" , windowTitle = "Assignment 1" ,
deltaStr = "Delta: " , deltaStr = "Delta: " ,
@ -164,7 +161,6 @@ namespace Execution
// Functionality // Functionality
void ChangeModel() void ChangeModel()
@ -184,7 +180,7 @@ namespace Execution
{ {
if (not Bunny.Ready()) if (not Bunny.Ready())
{ {
glfwSetWindowTitle(DefaultWindow, "Assignment 1: Loading Bunny..."); SetWindowHeader(DefaultWindow, "Assignment 1: Loading Bunny...");
Bunny.Load(); Bunny.Load();
} }
@ -197,28 +193,11 @@ namespace Execution
return; return;
} }
case EModels::Cube:
{
if (not Cube.Ready())
{
glfwSetWindowTitle(DefaultWindow, "Assignment 1: Loading Cube...");
Cube.Load();
}
ObjectToView.SetModel(Cube);
ObjectToView.SetScale(1.0f);
ObjectToView.SetPosition(Vector3(0, -1.0, 0));
return;
}
case EModels::Eight: case EModels::Eight:
{ {
if (not Eight.Ready()) if (not Eight.Ready())
{ {
glfwSetWindowTitle(DefaultWindow, "Assignment 1: Loading Eight..."); SetWindowHeader(DefaultWindow, "Assignment 1: Loading Eight...");
Eight.Load(); Eight.Load();
} }
@ -235,7 +214,7 @@ namespace Execution
{ {
if (not Gargoyle.Ready()) if (not Gargoyle.Ready())
{ {
glfwSetWindowTitle(DefaultWindow, "Assignment 1: Loading Gargoyle..."); SetWindowHeader(DefaultWindow, "Assignment 1: Loading Gargoyle...");
Gargoyle.Load(); Gargoyle.Load();
} }
@ -252,7 +231,7 @@ namespace Execution
{ {
if (not Hand.Ready()) if (not Hand.Ready())
{ {
glfwSetWindowTitle(DefaultWindow, "Assignment 1: Loading Hand..."); SetWindowHeader(DefaultWindow, "Assignment 1: Loading Hand...");
Hand.Load(); Hand.Load();
} }
@ -263,14 +242,13 @@ namespace Execution
ObjectToView.SetPosition(Vector3(0, -1.1f, 0)); ObjectToView.SetPosition(Vector3(0, -1.1f, 0));
return; return;
} }
case EModels::Sculpture: case EModels::Sculpture:
{ {
if (not Sculpture.Ready()) if (not Sculpture.Ready())
{ {
glfwSetWindowTitle(DefaultWindow, "Assignment 1: Loading Sculpture..."); SetWindowHeader(DefaultWindow, "Assignment 1: Loading Sculpture...");
Sculpture.Load(); Sculpture.Load();
} }
@ -285,7 +263,7 @@ namespace Execution
{ {
if (not Topology.Ready()) if (not Topology.Ready())
{ {
glfwSetWindowTitle(DefaultWindow, "Assignment 1: Loading Topology..."); SetWindowHeader(DefaultWindow, "Assignment 1: Loading Topology...");
Topology.Load(); Topology.Load();
} }
@ -300,7 +278,7 @@ namespace Execution
{ {
if (not Torus.Ready()) if (not Torus.Ready())
{ {
glfwSetWindowTitle(DefaultWindow, "Assignment 1: Loading Torus..."); SetWindowHeader(DefaultWindow, "Assignment 1: Loading Torus...");
Torus.Load(); Torus.Load();
} }
@ -411,8 +389,6 @@ namespace Execution
SetPolygonMode(DGL::EFace::Front_and_Back, DGL::ERenderMode::Fill); SetPolygonMode(DGL::EFace::Front_and_Back, DGL::ERenderMode::Fill);
glShadeModel(GL_FLAT);
// Cursor stuff // Cursor stuff
@ -435,14 +411,14 @@ namespace Execution
Light.Load(); Light.Load();
Cube.Load(); Bunny.Load();
ObjectMaterial.Color = DGL::Colors::WarmSphia.Vector(); ObjectMaterial.Color = DGL::Colors::WarmSphia.Vector();
ObjectMaterial.Ambience = 0.112f ; ObjectMaterial.Ambience = 0.112f ;
ObjectMaterial.Diffuse = 0.928f ; ObjectMaterial.Diffuse = 0.928f ;
ObjectMaterial.Specular = 0.21f ; ObjectMaterial.Specular = 0.21f ;
ObjectToView = Entity_Basic(Cube, ObjectMaterial); ObjectToView = Entity_Basic(Bunny, ObjectMaterial);
} }
@ -515,8 +491,6 @@ namespace Execution
InputDelta += DeltaTime; InputDelta += DeltaTime;
PhysicsDelta += DeltaTime; PhysicsDelta += DeltaTime;
RenderDelta += DeltaTime; RenderDelta += DeltaTime;
InputBufferDelta += DeltaTime;
} }
return; return;
@ -530,8 +504,8 @@ namespace Execution
if (!KeyPressed(_currentWindowContext, EKeyCodes::H )) H_Held = false; if (!KeyPressed(_currentWindowContext, EKeyCodes::H )) H_Held = false;
if (!KeyPressed(_currentWindowContext, EKeyCodes::M )) M_Held = false; if (!KeyPressed(_currentWindowContext, EKeyCodes::M )) M_Held = false;
// TODO: Not necessary for now and throws memory error.
if (KeyPressed(_currentWindowContext, EKeyCodes::F1) && not F1_Held) /*if (KeyPressed(_currentWindowContext, EKeyCodes::F1) && not F1_Held)
{ {
ECursorMode cursorMode = ECursorMode(GetMouseInputMode(DefaultWindow, EMouseMode::Cursor)); ECursorMode cursorMode = ECursorMode(GetMouseInputMode(DefaultWindow, EMouseMode::Cursor));
@ -554,7 +528,7 @@ namespace Execution
} }
F1_Held = true; F1_Held = true;
} }*/
if (KeyPressed(_currentWindowContext, EKeyCodes::H) && not H_Held) if (KeyPressed(_currentWindowContext, EKeyCodes::H) && not H_Held)
{ {
@ -673,7 +647,7 @@ namespace Execution
void RenderProcedure() void RenderProcedure()
{ {
glfwSetWindowTitle(DefaultWindow, WindowTitle.str().c_str()); SetWindowHeader(DefaultWindow, WindowTitle.str());
if (ShowLight) if (ShowLight)
{ {

9
x64/Debug/CompGraphics.Build.CppClean.log
View File

@ -1,9 +0,0 @@
f:\projects\compgraphics\x64\debug\compgraphics.exe
f:\projects\compgraphics\x64\debug\compgraphics.ilk
f:\projects\compgraphics\x64\debug\compgraphics.pdb
f:\projects\compgraphics\compgraphics\x64\debug\vc142.idb
f:\projects\compgraphics\compgraphics\x64\debug\vc142.pdb
f:\projects\compgraphics\compgraphics\x64\debug\compgraphics.tlog\cl.command.1.tlog
f:\projects\compgraphics\compgraphics\x64\debug\compgraphics.tlog\link.command.1.tlog
f:\projects\compgraphics\compgraphics\x64\debug\compgraphics.tlog\link.read.1.tlog
f:\projects\compgraphics\compgraphics\x64\debug\compgraphics.tlog\link.write.1.tlog

3
x64/Debug/CompGraphics.log
View File

@ -1,3 +0,0 @@
 Execution.cpp
F:\Projects\CompGraphics\CompGraphics\DGL\DGL_Entity.hpp(94,1): warning C4244: '+=': conversion from 'double' to 'DGL::gFloat', possible loss of data
CompGraphics.vcxproj -> F:\Projects\CompGraphics\x64\Debug\CompGraphics.exe

BIN
x64/Debug/CompGraphics.tlog/CL.command.1.tlog
View File

Binary file not shown.

BIN
x64/Debug/CompGraphics.tlog/CL.read.1.tlog
View File

Binary file not shown.

BIN
x64/Debug/CompGraphics.tlog/CL.write.1.tlog
View File

Binary file not shown.

2
x64/Debug/CompGraphics.tlog/CompGraphics.lastbuildstate
View File

@ -1,2 +0,0 @@
#TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0
Debug|x64|F:\Projects\CompGraphics\|

BIN
x64/Debug/CompGraphics.tlog/link.command.1.tlog
View File

Binary file not shown.

BIN
x64/Debug/CompGraphics.tlog/link.read.1.tlog
View File

Binary file not shown.

BIN
x64/Debug/CompGraphics.tlog/link.write.1.tlog
View File

Binary file not shown.

0
x64/Debug/CompGraphics.vcxproj.FileListAbsolute.txt
View File

BIN
x64/Debug/Execution.obj
View File

Binary file not shown.

BIN
x64/Debug/vc142.idb
View File

Binary file not shown.

BIN
x64/Debug/vc142.pdb
View File

Binary file not shown.