immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed linking convert_model (#332)

dev-mp
krzys-h 2014-10-25 12:44:52 +02:00
parent 78d7cc9eef
commit 81062e5e87
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -215,7 +215,7 @@ set(LIBS
${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_LIBRARY}
${OPTIONAL_LIBS} ${OPTIONAL_LIBS}
${PLATFORM_LIBS} ${PLATFORM_LIBS}
${PHYSFS_LIBRARY} ${PHYSFS_LIBRARY}
) )
set(COLOBOT_LIBS ${LIBS} PARENT_SCOPE) set(COLOBOT_LIBS ${LIBS} PARENT_SCOPE)
@ -239,7 +239,7 @@ set(SYSTEM_INCLUDES
${LOCALENAME_INCLUDE_DIR} ${LOCALENAME_INCLUDE_DIR}
${OPTIONAL_INCLUDE_DIRS} ${OPTIONAL_INCLUDE_DIRS}
${CLIPBOARD_INCLUDE_DIR} ${CLIPBOARD_INCLUDE_DIR}
${PHYSFS_INCLUDE_PATH} ${PHYSFS_INCLUDE_PATH}
) )
set(COLOBOT_LOCAL_INCLUDES ${LOCAL_INCLUDES} PARENT_SCOPE) set(COLOBOT_LOCAL_INCLUDES ${LOCAL_INCLUDES} PARENT_SCOPE)

38
src/graphics/engine/modelfile.cpp
View File

@ -24,7 +24,9 @@
#include "common/logger.h" #include "common/logger.h"
#include "common/stringutils.h" #include "common/stringutils.h"
#ifndef MODELFILE_NO_ENGINE
#include "common/resources/inputstream.h" #include "common/resources/inputstream.h"
#endif
#include "graphics/engine/engine.h" #include "graphics/engine/engine.h"
@ -436,13 +438,23 @@ bool CModelFile::ReadModel(const std::string& fileName)
{ {
m_triangles.clear(); m_triangles.clear();
#ifndef MODELFILE_NO_ENGINE
CInputStream stream; CInputStream stream;
stream.open(fileName.c_str()); stream.open(fileName);
if (!stream.is_open()) if (!stream.is_open())
{ {
GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); GetLogger()->Error("Could not open file '%s'\n", fileName.c_str());
return false; return false;
} }
#else
std::ifstream stream;
stream.open(fileName);
if (!stream.good())
{
GetLogger()->Error("Could not open file '%s'\n", fileName.c_str());
return false;
}
#endif
return ReadModel(stream); return ReadModel(stream);
} }
@ -827,13 +839,23 @@ struct NewModelTriangle1
bool CModelFile::ReadTextModel(const std::string& fileName) bool CModelFile::ReadTextModel(const std::string& fileName)
{ {
#ifndef MODELFILE_NO_ENGINE
CInputStream stream; CInputStream stream;
stream.open(fileName.c_str()); stream.open(fileName);
if (!stream.is_open()) if (!stream.is_open())
{ {
GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); GetLogger()->Error("Could not open file '%s'\n", fileName.c_str());
return false; return false;
} }
#else
std::ifstream stream;
stream.open(fileName);
if (!stream.good())
{
GetLogger()->Error("Could not open file '%s'\n", fileName.c_str());
return false;
}
#endif
return ReadTextModel(stream); return ReadTextModel(stream);
} }
@ -1024,13 +1046,23 @@ bool CModelFile::WriteTextModel(std::ostream& stream)
bool CModelFile::ReadBinaryModel(const std::string& fileName) bool CModelFile::ReadBinaryModel(const std::string& fileName)
{ {
#ifndef MODELFILE_NO_ENGINE
CInputStream stream; CInputStream stream;
stream.open(fileName.c_str()); stream.open(fileName);
if (!stream.is_open()) if (!stream.is_open())
{ {
GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); GetLogger()->Error("Could not open file '%s'\n", fileName.c_str());
return false; return false;
} }
#else
std::ifstream stream;
stream.open(fileName);
if (!stream.good())
{
GetLogger()->Error("Could not open file '%s'\n", fileName.c_str());
return false;
}
#endif
return ReadBinaryModel(stream); return ReadBinaryModel(stream);
} }