ed/DuctTaped_GL
1
0
Fork 0
mirror of https://github.com/Ed94/DuctTaped_GL.git synced 2025-07-24 17:33:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

Missing tape and some extra polish.

Browse Source
This commit is contained in:
Edward R. Gonzalez
2020-02-27 00:00:19 -05:00
parent 7dfb188fd2
commit f9c80fc326
4 changed files with 224 additions and 69 deletions

73
DGL/DGL_Entity.hpp

@@ -25,10 +25,14 @@ namespace DGL
{
namespace Colors
{
LinearColor Coral (1.0f , 0.5f , 0.31f, 1.0f);
LinearColor Grey (0.60f, 0.60f, 0.60f, 1.0f);
LinearColor WarmSphia(0.54f, 0.52f, 0.5f , 1.0f);
LinearColor White (1.0f , 1.0f , 1.0f , 1.0f);
LinearColor Blue (0.3f , 0.3f , 0.6f , 1.0f);
LinearColor Coral (1.0f , 0.5f , 0.31f, 1.0f);
LinearColor DarkTone (0.21f , 0.21f, 0.21f, 1.0f);
LinearColor Green (0.10f , 0.60f, 0.20f, 1.0f);
LinearColor Grey (0.60f , 0.60f, 0.60f, 1.0f);
LinearColor Red (0.436f, 0.04f, 0.01f, 1.0f);
LinearColor WarmSphia(0.54f , 0.52f, 0.5f , 1.0f);
LinearColor White (0.8f , 0.80f, 0.80f, 1.0f);
}
@@ -205,6 +209,7 @@ namespace DGL
public:
Entity_Basic() :
position (Vector3(0.0f) ),
rotation (Vector3(0.0f) ),
scale (Vector3(1.0f) ),
model (NULL ),
transform(CoordSpace(1.0f))
@@ -212,6 +217,7 @@ namespace DGL
Entity_Basic(Model& _model, Material_Phong& _material) :
position (Vector3(0.0f) ),
rotation (Vector3(0.0f) ),
scale (Vector3(1.0f) ),
model (&_model ),
transform(CoordSpace(1.0f)),
@@ -219,6 +225,11 @@ namespace DGL
//type (_type )
{};
void SetMaterial(Material_Phong& _material)
{
material = _material;
}
void SetModel(Model& _model)
{
model = &_model;
@@ -230,12 +241,6 @@ namespace DGL
{
scale = Vector3(_scaleBy);
transform = CoordSpace(1.0f);
transform = Translate(transform, position);
transform = Scale(transform, scale);
return;
}
@@ -243,18 +248,47 @@ namespace DGL
{
position = _position;
transform = CoordSpace(1.0f);
return;
}
transform = Translate(transform, position);
void Rotate(gFloat _rotationAmount, EAxis _axis)
{
switch (_axis)
{
case EAxis::X:
{
rotation.x += _rotationAmount;
transform = Scale(transform, scale);
break;
}
case EAxis::Y:
{
rotation.y += _rotationAmount;
break;
}
case EAxis::Z:
{
rotation.z += _rotationAmount;
break;
}
}
return;
}
void Update()
{
transform = CoordSpace(1.0f);
transform = DGL::Translate(transform, position);
transform = DGL::Rotate(transform, rotation.x, Vector3(1, 0, 0));
transform = DGL::Rotate(transform, rotation.y, Vector3(0, 1, 0));
transform = DGL::Rotate(transform, rotation.z, Vector3(0, 0, 1));
transform = DGL::Scale(transform, scale);
}
void Render(const CoordSpace& _projection, const CoordSpace& _viewport, const Vector3& _lightPosition, const VecColor& _lightColor)
@@ -283,10 +317,11 @@ namespace DGL
// EEntityType type;
Vector3 position ;
Vector3 scale ;
Model* model ;
CoordSpace transform ;
Material_Phong material ;
Vector3 position ;
Vector3 rotation ;
Vector3 scale ;
Model* model ;
CoordSpace transform;
Material_Phong material ;
};
}

2
DGL/DGL_Enum.hpp

@@ -127,6 +127,8 @@ namespace DGL
F1 = GLFW_KEY_F1 ,
F2 = GLFW_KEY_F2 ,
F3 = GLFW_KEY_F3 ,
F4 = GLFW_KEY_F4 ,
F5 = GLFW_KEY_F5 ,
A = GLFW_KEY_A ,
D = GLFW_KEY_D ,
E = GLFW_KEY_E ,

2
DGL/DGL_Utilities.hpp

@@ -151,7 +151,7 @@ namespace DGL
void InitalizeGLEW()
{
// If using GLEW version 1.13 or earlier
//glewExperimental = true;
glewExperimental = true;
std::cout << "Initializing Glew Version: " << glewGetString(GLEW_VERSION) << std::endl;