← Back to branch summary

~tomprogs/gewoopi/trunk

« back to all changes in this revision

Viewing changes to src/scene/mesh_loader/loader_obj.hpp

  • Committer: Thomas Geymayer
  • Date: 2010-03-26 11:56:05 UTC
  • Revision ID: tomgey@gmail.com-20100326115605-iir4j91614620ij3
Fixed .obj loading, enable grabbing and general cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/scene/mesh_loader/loader_obj.hpp
18
18
#include <vector>
19
19
 
20
20
#include "utilities/loader.hpp"
21
 
#include "core/vfs/file_iterator.hpp"
 
21
#include "core/vfs/ifstream.hpp"
22
22
#include "scene/mesh.hpp"
23
23
 
24
24
namespace gewoopi
64
64
 
65
65
    private:
66
66
 
67
 
      typedef core::vfs::file_iterator<char> iterator_t;
 
67
      typedef core::string::iterator iterator_t;
68
68
 
69
69
      void addPositionCoord( float value );
70
70
      void addPosition( iterator_t, iterator_t const& );
74
74
      void addNormalIndex( int index );
75
75
      void addFace( iterator_t, iterator_t const& );
76
76
      void addMatLib( iterator_t first, iterator_t const& last );
 
77
      void printUnknown( iterator_t first, iterator_t const& last );
77
78
 
78
79
      //------------------------------------------------------------------------
79
80
      // parsing variables
83
84
      math::uint32          _tmp_position_index[4];
84
85
      math::uint32          _tmp_normal_index[4];
85
86
 
86
 
      math::uint8           _index_position;
87
 
      math::uint8           _index_normal;
88
 
      math::uint8           _index_position_index;
89
 
      math::uint8           _index_normal_index;
 
87
      math::uint16          _index_position;
 
88
      math::uint16          _index_normal;
 
89
      math::uint16          _index_position_index;
 
90
      math::uint16          _index_normal_index;
90
91
 
91
92
      std::vector<math::Vector3f>   _positions;
92
93
      std::vector<math::Vector3f>   _normals;