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

- OBJ file reading

Browse Source 
- VBO memory management
- Lighting
This commit is contained in:
Matthias Blankertz
2014-11-17 18:19:46 +01:00
parent ba8e07aa4e
commit 5f388a1723
16 changed files with 578 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

223
objectParser.cc
View File

@@ -5,6 +5,9 @@
#include <map>
#include <tr1/functional>
#include <obj.hpp>
#define GLM_FORCE_RADIANS
#include <glm/glm.hpp>
#include <glm/gtc/packing.hpp>
#include "objectParser.hh"
@@ -20,68 +23,134 @@ class ObjectParser {
private:
void texture_vertex_callback(obj::float_type u, obj::float_type v)
{
assert(!_addedGenerated);
if ((u > 1.0f) || (u < 0.0f))
std::cout << "Warning: Clamping texture coordinate U to [0.0, 1.0]" << std::endl;
uint16_t c_u = static_cast<uint16_t>(fminf(1.0f, fmaxf(0.0f, u))*65535.0);
uint16_t c_u = glm::packUnorm1x16(u);
if ((v > 1.0f) || (v < 0.0f))
std::cout << "Warning: Clamping texture coordinate V to [0.0, 1.0]" << std::endl;
uint16_t c_v = static_cast<uint16_t>(fminf(1.0f, fmaxf(0.0f, v))*65535.0);
_texCoords.emplace_back(c_u, c_v);
uint16_t c_v = glm::packUnorm1x16(v);
_texCoords.emplace_back(glm::u16vec2(c_u, c_v));
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(x, y, z);
_vertices.emplace_back(glm::vec3(x, y, z));
std::cout << "v " << x << " " << y << " " << z << "\n";
}
void vertex_normal_callback(obj::float_type x, obj::float_type y, obj::float_type z)
{
assert(!_addedGenerated);
union {
struct {
signed :2;
signed z:10;
signed y:10;
signed x:10;
signed y:10;
signed z:10;
// signed :2;
// signed z:10;
// signed y:10;
// signed x:10;
} bits;
uint32_t all;
} pack_10;
if ((x > 1.0f) || (x < -1.0f))
std::cout << "Warning: Clamping normal X to [-1.0, 1.0]" << std::endl;
pack_10.bits.x = static_cast<int>(fminf(1.0f, fmaxf(-1.0f, x))*511.0);
if ((y > 1.0f) || (y < -1.0f))
std::cout << "Warning: Clamping normal Y to [-1.0, 1.0]" << std::endl;
pack_10.bits.y = static_cast<int>(fminf(1.0f, fmaxf(-1.0f, y))*511.0);
if ((z > 1.0f) || (z < -1.0f))
std::cout << "Warning: Clamping normal Z to [-1.0, 1.0]" << std::endl;
pack_10.bits.z = static_cast<int>(fminf(1.0f, fmaxf(-1.0f, z))*511.0);
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";
}
void triangular_face_geometric_vertices_callback(index_type a, index_type b, index_type c)
size_t _find_vertex_tc_norm(size_t vert, size_t tc, size_t norm)
{
}
size_t _find_vertex_tc_pair(index_2_tuple_type const& a)
{
auto pair_it = _vertex_tc_pairs_map.find(std::tuple<std::size_t, std::size_t>(std::tr1::get<0>(a), std::tr1::get<1>(a)));
auto pair_it = _vertex_tc_norm_map.find(std::tuple<std::size_t, std::size_t, std::size_t>(vert, tc, norm));
size_t pair_pos;
if (pair_it != _vertex_tc_pairs_map.end())
if (pair_it != _vertex_tc_norm_map.end())
pair_pos = pair_it->second;
else {
_vertex_tc_pairs.emplace_back(std::get<0>(_vertices[std::tr1::get<0>(a)-1]),
std::get<1>(_vertices[std::tr1::get<0>(a)-1]),
std::get<2>(_vertices[std::tr1::get<0>(a)-1]),
std::get<0>(_texCoords[std::tr1::get<1>(a)-1]),
std::get<1>(_texCoords[std::tr1::get<1>(a)-1]));
pair_pos = _vertex_tc_pairs.size()-1;
_vertex_tc_pairs_map.emplace(std::tuple<std::size_t, std::size_t>(std::tr1::get<0>(a), std::tr1::get<1>(a)),
_vertex_tc_norm.emplace_back(_vertices[vert],
_texCoords[tc],
_normals[norm]);
pair_pos = _vertex_tc_norm.size()-1;
_vertex_tc_norm_map.emplace(std::tuple<std::size_t, std::size_t, std::size_t>(vert, tc, norm),
pair_pos);
}
return pair_pos;
}
glm::vec3 _calculateNormal(glm::vec3 const& a, glm::vec3 const& b, glm::vec3 const& c)
{
return glm::normalize(glm::cross(b-a, c-a));
}
size_t _generateNormal(glm::vec3 const& a, glm::vec3 const& b, glm::vec3 const& c)
{
glm::vec3 normal = _calculateNormal(a, b, c);
uint32_t norm32 = glm::packSnorm3x10_1x2(glm::vec4(normal, 0.0f));
size_t pos = 0;
for(auto& ent : _normals) {
if (ent == norm32)
return pos;
++pos;
}
_addedGenerated = true;
_normals.push_back(norm32);
return _normals.size()-1;
}
size_t _generateTC()
{
glm::u16vec2 tc(0, 0);
size_t pos = 0;
for(auto& ent : _texCoords) {
if (ent == tc)
return pos;
++pos;
}
_addedGenerated = true;
_texCoords.push_back(tc);
return _texCoords.size()-1;
}
void triangular_face_geometric_vertices_callback(index_type a, index_type b, index_type c)
{
if ((_vertices.size() < a) ||
(_vertices.size() < b) ||
(_vertices.size() < c))
throw ParseException("Vertex Index out of range");
size_t norm = _generateNormal(_vertices[a-1],
_vertices[b-1],
_vertices[c-1]);
size_t tc = _generateTC();
std::cout << "f (" << a << ", " << tc << ", " << norm << ")" <<
" (" << b << ", " << tc << ", " << norm << ")" <<
" (" << c << ", " << tc << ", " << norm << ")\n";
size_t a_pos = _find_vertex_tc_norm(a-1,
tc,
norm);
size_t b_pos = _find_vertex_tc_norm(b-1,
tc,
norm);
size_t c_pos = _find_vertex_tc_norm(c-1,
tc,
norm);
_faces.emplace_back(a_pos, b_pos, c_pos);
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)
{
@@ -93,14 +162,24 @@ private:
(_texCoords.size() < std::tr1::get<1>(b)) ||
(_texCoords.size() < std::tr1::get<1>(c)))
throw ParseException("Texture Coordinate Index out of range");
std::cout << "f (" << std::tr1::get<0>(a) << ", " << std::tr1::get<1>(a) << ")" <<
" (" << std::tr1::get<0>(b) << ", " << std::tr1::get<1>(b) << ")" <<
" (" << std::tr1::get<0>(c) << ", " << std::tr1::get<1>(c) << ")\n";
size_t norm = _generateNormal(_vertices[std::tr1::get<0>(a)-1],
_vertices[std::tr1::get<0>(b)-1],
_vertices[std::tr1::get<0>(c)-1]);
size_t a_pos = _find_vertex_tc_pair(a);
size_t b_pos = _find_vertex_tc_pair(b);
size_t c_pos = _find_vertex_tc_pair(c);
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,
norm);
size_t b_pos = _find_vertex_tc_norm(std::tr1::get<0>(b)-1,
std::tr1::get<1>(b)-1,
norm);
size_t c_pos = _find_vertex_tc_norm(std::tr1::get<0>(c)-1,
std::tr1::get<1>(c)-1,
norm);
_faces.emplace_back(a_pos, b_pos, c_pos);
std::cout << "\t [" << a_pos << ", " << b_pos << ", " << c_pos << "]\n";
@@ -108,11 +187,67 @@ private:
void triangular_face_geometric_vertices_vertex_normals_callback(index_2_tuple_type a, index_2_tuple_type b, index_2_tuple_type c)
{
if ((_vertices.size() < std::tr1::get<0>(a)) ||
(_vertices.size() < std::tr1::get<0>(b)) ||
(_vertices.size() < std::tr1::get<0>(c)))
throw ParseException("Vertex Index out of range");
if ((_normals.size() < std::tr1::get<1>(a)) ||
(_normals.size() < std::tr1::get<1>(b)) ||
(_normals.size() < std::tr1::get<1>(c)))
throw ParseException("Normal Index out of range");
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";
size_t a_pos = _find_vertex_tc_norm(std::tr1::get<0>(a)-1,
tc,
std::tr1::get<1>(a)-1);
size_t b_pos = _find_vertex_tc_norm(std::tr1::get<0>(b)-1,
tc,
std::tr1::get<1>(b)-1);
size_t c_pos = _find_vertex_tc_norm(std::tr1::get<0>(c)-1,
tc,
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";
}
void triangular_face_geometric_vertices_texture_vertices_vertex_normals_callback(index_3_tuple_type a, index_3_tuple_type b,
index_3_tuple_type c)
{
if ((_vertices.size() < std::tr1::get<0>(a)) ||
(_vertices.size() < std::tr1::get<0>(b)) ||
(_vertices.size() < std::tr1::get<0>(c)))
throw ParseException("Vertex Index out of range");
if ((_texCoords.size() < std::tr1::get<1>(a)) ||
(_texCoords.size() < std::tr1::get<1>(b)) ||
(_texCoords.size() < std::tr1::get<1>(c)))
throw ParseException("Texture Coordinate Index out of range");
if ((_normals.size() < std::tr1::get<2>(a)) ||
(_normals.size() < std::tr1::get<2>(b)) ||
(_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";
size_t a_pos = _find_vertex_tc_norm(std::tr1::get<0>(a)-1,
std::tr1::get<1>(a)-1,
std::tr1::get<2>(a)-1);
size_t b_pos = _find_vertex_tc_norm(std::tr1::get<0>(b)-1,
std::tr1::get<1>(b)-1,
std::tr1::get<2>(b)-1);
size_t c_pos = _find_vertex_tc_norm(std::tr1::get<0>(c)-1,
std::tr1::get<1>(c)-1,
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";
}
void quadrilateral_face_geometric_vertices_callback(index_type a, index_type b, index_type c, index_type d)
@@ -201,16 +336,19 @@ private:
assert(false);
}
std::vector<std::tuple<float, float, float> > _vertices;
std::vector<std::tuple<uint16_t, uint16_t> > _texCoords;
bool _addedGenerated;
std::vector<glm::vec3> _vertices;
std::vector<glm::u16vec2> _texCoords;
std::vector<uint32_t> _normals;
std::map<std::tuple<std::size_t, std::size_t>, std::size_t > _vertex_tc_pairs_map;
std::vector<std::tuple<float, float, float, uint16_t, uint16_t> > _vertex_tc_pairs;
std::map<std::tuple<std::size_t, std::size_t, std::size_t>, std::size_t > _vertex_tc_norm_map;
std::vector<std::tuple<glm::vec3, glm::u16vec2, glm::uint32_t> > _vertex_tc_norm;
std::vector<std::tuple<std::size_t, std::size_t, std::size_t> > _faces;
public:
ObjectParser() {
ObjectParser() : _addedGenerated(false) {
}
~ObjectParser() {
@@ -249,13 +387,14 @@ public:
std::vector<objVertexAttribs> buildVA()
{
std::vector<objVertexAttribs> ret;
for (auto const& ent : _vertex_tc_pairs) {
for (auto const& ent : _vertex_tc_norm) {
objVertexAttribs tmp;
tmp.vertex[0] = std::get<0>(ent);
tmp.vertex[1] = std::get<1>(ent);
tmp.vertex[2] = std::get<2>(ent);
tmp.texCoords[0] = std::get<3>(ent);
tmp.texCoords[1] = std::get<4>(ent);
tmp.vertex[0] = std::get<0>(ent).x;
tmp.vertex[1] = std::get<0>(ent).y;
tmp.vertex[2] = std::get<0>(ent).z;
tmp.texCoords[0] = std::get<1>(ent).x;
tmp.texCoords[1] = std::get<1>(ent).y;
tmp.normal = std::get<2>(ent);
ret.push_back(tmp);
}
return ret;