v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Addressed warnings generated on MSVC across x86 and x64.

pull/1457/head
Jared Mulconry 2017-09-24 19:29:43 +10:00
parent b5ac248703
commit 059a32654e
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/MMDImporter.cpp
View File

@ -118,7 +118,7 @@ void MMDImporter::InternReadFile(const std::string &file, aiScene *pScene,
// Get the file-size and validate it, throwing an exception when fails // Get the file-size and validate it, throwing an exception when fails
fileStream.seekg(0, fileStream.end); fileStream.seekg(0, fileStream.end);
size_t fileSize = fileStream.tellg(); size_t fileSize = static_cast<size_t>(fileStream.tellg());
fileStream.seekg(0, fileStream.beg); fileStream.seekg(0, fileStream.beg);
if (fileSize < sizeof(pmx::PmxModel)) { if (fileSize < sizeof(pmx::PmxModel)) {

2
code/glTF2Exporter.cpp
View File

@ -741,7 +741,7 @@ void glTF2Exporter::MergeMeshes()
for (unsigned int n = 0; n < mAsset->nodes.Size(); ++n) { for (unsigned int n = 0; n < mAsset->nodes.Size(); ++n) {
Ref<Node> node = mAsset->nodes.Get(n); Ref<Node> node = mAsset->nodes.Get(n);
unsigned int nMeshes = node->meshes.size(); unsigned int nMeshes = static_cast<unsigned int>(node->meshes.size());
//skip if it's 1 or less meshes per node //skip if it's 1 or less meshes per node
if (nMeshes > 1) { if (nMeshes > 1) {

5
samples/SimpleOpenGL/CMakeLists.txt
View File

@ -16,6 +16,11 @@ IF ( NOT GLUT_FOUND )
ENDIF ( MSVC ) ENDIF ( MSVC )
ENDIF ( NOT GLUT_FOUND ) ENDIF ( NOT GLUT_FOUND )
if ( MSVC )
ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
endif ( MSVC )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${Assimp_SOURCE_DIR}/include ${Assimp_SOURCE_DIR}/include
${Assimp_SOURCE_DIR}/code ${Assimp_SOURCE_DIR}/code

5
samples/SimpleTexturedOpenGL/CMakeLists.txt
View File

@ -11,6 +11,11 @@ IF ( NOT GLUT_FOUND )
ENDIF ( MSVC ) ENDIF ( MSVC )
ENDIF ( NOT GLUT_FOUND ) ENDIF ( NOT GLUT_FOUND )
if ( MSVC )
ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
endif ( MSVC )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${Assimp_SOURCE_DIR}/include ${Assimp_SOURCE_DIR}/include
${Assimp_SOURCE_DIR}/code ${Assimp_SOURCE_DIR}/code

1
tools/assimp_view/stdafx.h
View File

@ -23,7 +23,6 @@
#define _WIN32_IE 0x0600 // Ändern Sie dies in den geeigneten Wert für andere Versionen von IE. #define _WIN32_IE 0x0600 // Ändern Sie dies in den geeigneten Wert für andere Versionen von IE.
#endif #endif
#define WIN32_LEAN_AND_MEAN // Selten verwendete Teile der Windows-Header nicht einbinden.
// Windows-Headerdateien: // Windows-Headerdateien:
#include <windows.h> #include <windows.h>