ed/DuctTaped_GL
1
0
Fork 0
mirror of https://github.com/Ed94/DuctTaped_GL.git synced 2025-06-15 19:41:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed normal paperclips with hotglue for everything except cube.

Browse Source 
Also prevent input spamming on actions that require a re-press.
This commit is contained in:
Edward R. Gonzalez
2020-02-21 16:05:46 -05:00
parent da17f52c9d
commit 6dd91a3531
17 changed files with 100 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
DGL/DGL_Model.hpp
View File

@ -73,7 +73,7 @@ namespace DGL
struct Face
{
Vec3Int Vertexes, Normals;
Vec3Int Vertexes;
};
using FaceList = std::vector<Face>;
@ -107,7 +107,7 @@ namespace DGL
for (int index = 0; index < 3; index++)
{
generated.Vertexes[index] = vertIndexes[index];
generated.Vertexes.vec[index] = vertIndexes[index];
if (index < 2)
{
@ -119,7 +119,7 @@ namespace DGL
if (normals.size() > 0)
{
generated.Normals[index] = normals[index];
//generated.Normals.vec[index] = normals[index];
}
}
@ -144,22 +144,40 @@ namespace DGL
for (int faceIndex = 0; faceIndex < faces.size(); faceIndex++)
{
int vertexIndex1 = faces[faceIndex].Vertexes[0],
vertexIndex2 = faces[faceIndex].Vertexes[1],
vertexIndex3 = faces[faceIndex].Vertexes[2];
int vertexIndex1 = faces[faceIndex].Vertexes.vec[0],
vertexIndex2 = faces[faceIndex].Vertexes.vec[1],
vertexIndex3 = faces[faceIndex].Vertexes.vec[2] ;
Vector3 edge1 = verticies[vertexIndex2] - verticies[vertexIndex1],
edge2 = verticies[vertexIndex3] - verticies[vertexIndex1],
Vector3 vert1 = verticies[vertexIndex1],
vert2 = verticies[vertexIndex2],
vert3 = verticies[vertexIndex3] ;
normal = GetDirection(GetCrossNormal(edge1, edge2));
Vector3 edge1 = vert2 - vert1,
edge2 = vert3 - vert1,
faces[faceIndex].Normals[0] = vertexIndex1;
faces[faceIndex].Normals[1] = vertexIndex2;
faces[faceIndex].Normals[2] = vertexIndex3;
normal = GetCrossNormal(edge1, edge2);
normals[vertexIndex1] = normal;
normals[vertexIndex2] = normal;
normals[vertexIndex3] = normal;
//faces[faceIndex].Normals.vec[0] = vertexIndex1;
//faces[faceIndex].Normals.vec[1] = vertexIndex2;
//faces[faceIndex].Normals.vec[2] = vertexIndex3;
normals[vertexIndex1] += normal;
normals[vertexIndex2] += normal;
normals[vertexIndex3] += normal;
}
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]);
}
}
@ -246,6 +264,16 @@ namespace DGL
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()

15
DGL/DGL_Types.hpp
View File

@ -83,7 +83,20 @@ namespace DGL
using UVList = std::vector < Vector2>;
using Vec2Int = Generic::Vector2< gUInt >;
using Vec3Int = Generic::Vector3< gUInt >;
struct Vec3Int
{
union
{
gUInt vec[3];
gUInt x, y, z;
};
};
//using Vec3Int = Generic::Vector3< gUInt >;
using VertexList = std ::vector < Vector3>;

2
DGL/DGL_Utilities.hpp
View File

@ -28,7 +28,7 @@ namespace DGL
// Constants
constexpr Window* NotShared () { return NULL; }
constexpr Monitor* WindowedMode() { return NULL; }
constexpr Monitor* WindowedMode() { return NULL; }