Changeset 367 for trunk/src/formats


Ignore:
Timestamp:
05/16/15 23:12:22 (10 years ago)
Author:
epyon
Message:
  • fixed compilation and warnings on gcc
  • slowly removing/merging external includes
Location:
trunk/src/formats
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/formats/assimp_loader.cc

    r365 r367  
    77#include "nv/formats/assimp_loader.hh"
    88#include <unordered_map>
    9 #include <glm/gtx/transform.hpp>
    109#include "nv/io/std_stream.hh"
    1110#include "nv/gfx/mesh_creator.hh"

  • trunk/src/formats/md2_loader.cc

    r365 r367  
    77#include "nv/formats/md2_loader.hh"
    88
    9 #include <glm/gtc/constants.hpp>
    109#include "nv/core/logging.hh"
    1110#include <cstring>

  • trunk/src/formats/md3_loader.cc

    r352 r367  
    77#include "nv/formats/md3_loader.hh"
    88
    9 #include <glm/gtc/constants.hpp>
    109#include "nv/core/logging.hh"
    1110#include <cstring>

  • trunk/src/formats/md5_loader.cc

    r323 r367  
    55#include "nv/formats/md5_loader.hh"
    66
    7 #include <glm/gtc/constants.hpp>
    87#include "nv/core/logging.hh"
    98#include "nv/io/std_stream.hh"
    10 #include <cstring>
    119
    1210using namespace nv;
    … …  
    1412static void next_line( std::istream& stream )
    1513{
    16         stream.ignore( std::numeric_limits<std::streamsize>::max(), '\n' );
     14        stream.ignore( 1024*1024, '\n' );
    1715}
    1816
    1917static inline void discard( std::istream& stream, const std::string& token )
    2018{
    21 //      stream.ignore( std::numeric_limits<std::streamsize>::max(), ' ' );
    2219        std::string discarded;
    2320        stream >> discarded;
Note: See TracChangeset for help on using the changeset viewer.