benkyd/SMH-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plannnninnnngggg

Browse Source
This commit is contained in:
Ben
2019-10-04 17:44:29 +01:00
parent b315cc8951
commit 9e184d15ce
4 changed files with 87 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@@ -40,9 +40,9 @@ if (UNIX)
endif (UNIX) endif (UNIX)
include_directories(${executable} include_directories(${executable}
#${PNG_INCLUDE_DIR} #${PNG_INCLUDE_DIR}
#${JPEG_INCLUDE_DIR} #${JPEG_INCLUDE_DIR}
${IncludeDIR} ${IncludeDIR}
) )
file(GLOB SourceFiles file(GLOB SourceFiles
@@ -53,8 +53,8 @@ file(GLOB SourceFiles
add_executable(${executable} ${SourceFiles}) add_executable(${executable} ${SourceFiles})
set_target_properties(${executable} PROPERTIES set_target_properties(${executable} PROPERTIES
CXX_STANDARD 17 CXX_STANDARD 17
CXX_EXTENSIONS OFF CXX_EXTENSIONS OFF
) )
if (UNIX) if (UNIX)
@@ -63,7 +63,7 @@ if (UNIX)
#SDL2_image #SDL2_image
#PNG::PNG #PNG::PNG
#JPEG::JPEG #JPEG::JPEG
OpenGL::OpenGL OpenGL::OpenGL
OpenGL::GL OpenGL::GL
Threads::Threads Threads::Threads
) )
@@ -80,5 +80,5 @@ if (WIN32)
endif (WIN32) endif (WIN32)
target_link_libraries(${executable} target_link_libraries(${executable}
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
) )

160
OBJLoaderExample.cpp → include/OBJLoaderExample.cpp
View File

@@ -1,80 +1,80 @@
#define TINYOBJLOADER_IMPLEMENTATION // define this in only *one* .cc #define TINYOBJLOADER_IMPLEMENTATION // define this in only *one* .cc
#include "tiny_obj_loader.h" #include "tiny_obj_loader.h"
std::string inputfile = "cornell_box.obj"; std::string inputfile = "cornell_box.obj";
tinyobj::attrib_t attrib; tinyobj::attrib_t attrib;
std::vector<tinyobj::shape_t> shapes; std::vector<tinyobj::shape_t> shapes;
std::vector<tinyobj::material_t> materials; std::vector<tinyobj::material_t> materials;
std::string warn; std::string warn;
std::string err; std::string err;
bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, inputfile.c_str()); bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, inputfile.c_str());
if (!err.empty()) { // `err` may contain warning message. if (!err.empty()) { // `err` may contain warning message.
std::cerr << err << std::endl; std::cerr << err << std::endl;
} }
if (!ret) { if (!ret) {
exit(1); exit(1);
} }
// Loop over shapes // Loop over shapes
for (size_t s = 0; s < shapes.size(); s++) { for (size_t s = 0; s < shapes.size(); s++) {
// Loop over faces(polygon) // Loop over faces(polygon)
size_t index_offset = 0; size_t index_offset = 0;
for (size_t f = 0; f < shapes[s].mesh.num_face_vertices.size(); f++) { for (size_t f = 0; f < shapes[s].mesh.num_face_vertices.size(); f++) {
int fv = shapes[s].mesh.num_face_vertices[f]; int fv = shapes[s].mesh.num_face_vertices[f];
// Loop over vertices in the face. // Loop over vertices in the face.
for (size_t v = 0; v < fv; v++) { for (size_t v = 0; v < fv; v++) {
// access to vertex // access to vertex
tinyobj::index_t idx = shapes[s].mesh.indices[index_offset + v]; tinyobj::index_t idx = shapes[s].mesh.indices[index_offset + v];
tinyobj::real_t vx = attrib.vertices[3*idx.vertex_index+0]; tinyobj::real_t vx = attrib.vertices[3*idx.vertex_index+0];
tinyobj::real_t vy = attrib.vertices[3*idx.vertex_index+1]; tinyobj::real_t vy = attrib.vertices[3*idx.vertex_index+1];
tinyobj::real_t vz = attrib.vertices[3*idx.vertex_index+2]; tinyobj::real_t vz = attrib.vertices[3*idx.vertex_index+2];
tinyobj::real_t nx = attrib.normals[3*idx.normal_index+0]; tinyobj::real_t nx = attrib.normals[3*idx.normal_index+0];
tinyobj::real_t ny = attrib.normals[3*idx.normal_index+1]; tinyobj::real_t ny = attrib.normals[3*idx.normal_index+1];
tinyobj::real_t nz = attrib.normals[3*idx.normal_index+2]; tinyobj::real_t nz = attrib.normals[3*idx.normal_index+2];
tinyobj::real_t tx = attrib.texcoords[2*idx.texcoord_index+0]; tinyobj::real_t tx = attrib.texcoords[2*idx.texcoord_index+0];
tinyobj::real_t ty = attrib.texcoords[2*idx.texcoord_index+1]; tinyobj::real_t ty = attrib.texcoords[2*idx.texcoord_index+1];
// Optional: vertex colors // Optional: vertex colors
// tinyobj::real_t red = attrib.colors[3*idx.vertex_index+0]; // tinyobj::real_t red = attrib.colors[3*idx.vertex_index+0];
// tinyobj::real_t green = attrib.colors[3*idx.vertex_index+1]; // tinyobj::real_t green = attrib.colors[3*idx.vertex_index+1];
// tinyobj::real_t blue = attrib.colors[3*idx.vertex_index+2]; // tinyobj::real_t blue = attrib.colors[3*idx.vertex_index+2];
} }
index_offset += fv; index_offset += fv;
// per-face material // per-face material
shapes[s].mesh.material_ids[f]; shapes[s].mesh.material_ids[f];
} }
} }
/** /**
* attrib_t::vertices => 3 floats per vertex * attrib_t::vertices => 3 floats per vertex
v[0] v[1] v[2] v[3] v[n-1] v[0] v[1] v[2] v[3] v[n-1]
+-----------+-----------+-----------+-----------+ +-----------+ +-----------+-----------+-----------+-----------+ +-----------+
| x | y | z | x | y | z | x | y | z | x | y | z | .... | x | y | z | | x | y | z | x | y | z | x | y | z | x | y | z | .... | x | y | z |
+-----------+-----------+-----------+-----------+ +-----------+ +-----------+-----------+-----------+-----------+ +-----------+
attrib_t::normals => 3 floats per vertex attrib_t::normals => 3 floats per vertex
n[0] n[1] n[2] n[3] n[n-1] n[0] n[1] n[2] n[3] n[n-1]
+-----------+-----------+-----------+-----------+ +-----------+ +-----------+-----------+-----------+-----------+ +-----------+
| x | y | z | x | y | z | x | y | z | x | y | z | .... | x | y | z | | x | y | z | x | y | z | x | y | z | x | y | z | .... | x | y | z |
+-----------+-----------+-----------+-----------+ +-----------+ +-----------+-----------+-----------+-----------+ +-----------+
attrib_t::texcoords => 2 floats per vertex attrib_t::texcoords => 2 floats per vertex
t[0] t[1] t[2] t[3] t[n-1] t[0] t[1] t[2] t[3] t[n-1]
+-----------+-----------+-----------+-----------+ +-----------+ +-----------+-----------+-----------+-----------+ +-----------+
| u | v | u | v | u | v | u | v | .... | u | v | | u | v | u | v | u | v | u | v | .... | u | v |
+-----------+-----------+-----------+-----------+ +-----------+ +-----------+-----------+-----------+-----------+ +-----------+
attrib_t::colors => 3 floats per vertex(vertex color. optional) attrib_t::colors => 3 floats per vertex(vertex color. optional)
c[0] c[1] c[2] c[3] c[n-1] c[0] c[1] c[2] c[3] c[n-1]
+-----------+-----------+-----------+-----------+ +-----------+ +-----------+-----------+-----------+-----------+ +-----------+
| x | y | z | x | y | z | x | y | z | x | y | z | .... | x | y | z | | x | y | z | x | y | z | x | y | z | x | y | z | .... | x | y | z |
+-----------+-----------+-----------+-----------+ +-----------+ +-----------+-----------+-----------+-----------+ +-----------+
/* /*

7
resources/shaders/shadowmap.frag
View File

@@ -1,7 +0,0 @@
#version 330
out float fragdepth;
void main(){
gl_FragDepth = gl_FragCoord.z;
}

10
resources/shaders/shadowmap.vert
View File

@@ -1,10 +0,0 @@
#version 330
in vec3 vertPos;
uniform mat4 lightSpaceMatrix;
uniform mat4 model;
void main() {
gl_Position = lightSpaceMatrix * model * vec4(vertPos, 1.0);
}