matthias/openglplayground
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Comment out some debug; change FPS calc; misc changes

Browse Source
This commit is contained in:
Matthias Blankertz
2015-03-08 13:55:46 +01:00
parent bdc2ef58f4
commit 31e3a307b5
5 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
objectParser.cc
View File

@@ -31,13 +31,13 @@ private:
std::cout << "Warning: Clamping texture coordinate V to [0.0, 1.0]" << std::endl;
uint16_t c_v = glm::packUnorm1x16(v);
_texCoords.emplace_back(glm::u16vec2(c_u, c_v));
std::cout << "vt " << c_u << " " << c_v << "\n";
//std::cout << "vt " << c_u << " " << c_v << "\n";
}
void geometric_vertex_callback(obj::float_type x, obj::float_type y, obj::float_type z)
{
_vertices.emplace_back(glm::vec3(x, y, z));
std::cout << "v " << x << " " << y << " " << z << "\n";
//std::cout << "v " << x << " " << y << " " << z << "\n";
}
void vertex_normal_callback(obj::float_type x, obj::float_type y, obj::float_type z)
@@ -63,7 +63,7 @@ private:
std::cout << "Warning: Clamping normal Z to [-1.0, 1.0]" << std::endl;
pack_10.all = glm::packSnorm3x10_1x2(glm::vec4(x, y, z, 0.0f));
_normals.push_back(pack_10.all);
std::cout << "vn " << pack_10.bits.x << " " << pack_10.bits.y << " " << pack_10.bits.z << "\n";
// std::cout << "vn " << pack_10.bits.x << " " << pack_10.bits.y << " " << pack_10.bits.z << "\n";
}
size_t _find_vertex_tc_norm(size_t vert, size_t tc, size_t norm)
@@ -134,9 +134,9 @@ private:
_vertices[c-1]);
size_t tc = _generateTC();
std::cout << "f (" << a << ", " << tc << ", " << norm << ")" <<
" (" << b << ", " << tc << ", " << norm << ")" <<
" (" << c << ", " << tc << ", " << norm << ")\n";
//std::cout << "f (" << a << ", " << tc << ", " << norm << ")" <<
// " (" << b << ", " << tc << ", " << norm << ")" <<
// " (" << c << ", " << tc << ", " << norm << ")\n";
size_t a_pos = _find_vertex_tc_norm(a-1,
tc,
@@ -149,7 +149,7 @@ private:
norm);
_faces.emplace_back(a_pos, b_pos, c_pos);
std::cout << "\t [" << a_pos << ", " << b_pos << ", " << c_pos << "]\n";
//std::cout << "\t [" << a_pos << ", " << b_pos << ", " << c_pos << "]\n";
}
void triangular_face_geometric_vertices_texture_vertices_callback(index_2_tuple_type a, index_2_tuple_type b, index_2_tuple_type c)
@@ -167,9 +167,9 @@ private:
_vertices[std::tr1::get<0>(b)-1],
_vertices[std::tr1::get<0>(c)-1]);
std::cout << "f (" << std::tr1::get<0>(a) << ", " << std::tr1::get<1>(a) << ", " << norm << ")" <<
" (" << std::tr1::get<0>(b) << ", " << std::tr1::get<1>(b) << ", " << norm << ")" <<
" (" << std::tr1::get<0>(c) << ", " << std::tr1::get<1>(c) << ", " << norm << ")\n";
//std::cout << "f (" << std::tr1::get<0>(a) << ", " << std::tr1::get<1>(a) << ", " << norm << ")" <<
// " (" << std::tr1::get<0>(b) << ", " << std::tr1::get<1>(b) << ", " << norm << ")" <<
// " (" << std::tr1::get<0>(c) << ", " << std::tr1::get<1>(c) << ", " << norm << ")\n";
size_t a_pos = _find_vertex_tc_norm(std::tr1::get<0>(a)-1,
std::tr1::get<1>(a)-1,
@@ -182,7 +182,7 @@ private:
norm);
_faces.emplace_back(a_pos, b_pos, c_pos);
std::cout << "\t [" << a_pos << ", " << b_pos << ", " << c_pos << "]\n";
//std::cout << "\t [" << a_pos << ", " << b_pos << ", " << c_pos << "]\n";
}
void triangular_face_geometric_vertices_vertex_normals_callback(index_2_tuple_type a, index_2_tuple_type b, index_2_tuple_type c)
@@ -198,9 +198,9 @@ private:
size_t tc = _generateTC();
std::cout << "f (" << std::tr1::get<0>(a) << ", " << tc << ", " << std::tr1::get<1>(a) << ")" <<
" (" << std::tr1::get<0>(b) << ", " << tc << "," << std::tr1::get<1>(b) << ")" <<
" (" << std::tr1::get<0>(c) << ", " << tc << ", " << std::tr1::get<1>(c) << ")\n";
//std::cout << "f (" << std::tr1::get<0>(a) << ", " << tc << ", " << std::tr1::get<1>(a) << ")" <<
// " (" << std::tr1::get<0>(b) << ", " << tc << "," << std::tr1::get<1>(b) << ")" <<
// " (" << std::tr1::get<0>(c) << ", " << tc << ", " << std::tr1::get<1>(c) << ")\n";
size_t a_pos = _find_vertex_tc_norm(std::tr1::get<0>(a)-1,
tc,
@@ -213,7 +213,7 @@ private:
std::tr1::get<1>(c)-1);
_faces.emplace_back(a_pos, b_pos, c_pos);
std::cout << "\t [" << a_pos << ", " << b_pos << ", " << c_pos << "]\n";
//std::cout << "\t [" << a_pos << ", " << b_pos << ", " << c_pos << "]\n";
}
void triangular_face_geometric_vertices_texture_vertices_vertex_normals_callback(index_3_tuple_type a, index_3_tuple_type b,
@@ -232,9 +232,9 @@ private:
(_normals.size() < std::tr1::get<2>(c)))
throw ParseException("Normal Index out of range");
std::cout << "f (" << std::tr1::get<0>(a) << ", " << std::tr1::get<1>(a) << ", " << std::tr1::get<2>(a) << ")" <<
" (" << std::tr1::get<0>(b) << ", " << std::tr1::get<1>(b) << ", " << std::tr1::get<2>(b) << ")" <<
" (" << std::tr1::get<0>(c) << ", " << std::tr1::get<1>(c) << ", " << std::tr1::get<2>(c) << ")\n";
//std::cout << "f (" << std::tr1::get<0>(a) << ", " << std::tr1::get<1>(a) << ", " << std::tr1::get<2>(a) << ")" <<
// " (" << std::tr1::get<0>(b) << ", " << std::tr1::get<1>(b) << ", " << std::tr1::get<2>(b) << ")" <<
// " (" << std::tr1::get<0>(c) << ", " << std::tr1::get<1>(c) << ", " << std::tr1::get<2>(c) << ")\n";
size_t a_pos = _find_vertex_tc_norm(std::tr1::get<0>(a)-1,
std::tr1::get<1>(a)-1,
@@ -247,7 +247,7 @@ private:
std::tr1::get<2>(c)-1);
_faces.emplace_back(a_pos, b_pos, c_pos);
std::cout << "\t [" << a_pos << ", " << b_pos << ", " << c_pos << "]\n";
//std::cout << "\t [" << a_pos << ", " << b_pos << ", " << c_pos << "]\n";
}
void quadrilateral_face_geometric_vertices_callback(index_type a, index_type b, index_type c, index_type d)