kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows build errors and warning fixes

Browse Source
This commit is contained in:
Kearwood Kip Gilbert
2017-07-27 23:37:32 -07:00
parent 7b1ea47f88
commit 0ef0c4276d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kraken/KRContext.h
View File

@@ -89,7 +89,7 @@ public:
typedef void log_callback(void *userdata, const std::string &message, log_level level); typedef void log_callback(void *userdata, const std::string &message, log_level level);
static void SetLogCallback(log_callback *log_callback, void *user_data); static void SetLogCallback(log_callback *log_callback, void *user_data);
static void Log(log_level level, const std::string &message_format, ...); static void Log(log_level level, const std::string message_format, ...);
void doStreaming(); void doStreaming();
void receivedMemoryWarning(); void receivedMemoryWarning();

4
kraken/KRMesh.cpp
View File

@@ -1316,7 +1316,7 @@ void KRMesh::convertToIndexed()
} }
if(submesh_index == 0 || vertex_index_offset + vertex_count > 0xffff) { if(submesh_index == 0 || vertex_index_offset + vertex_count > 0xffff) {
mi.vertex_index_bases.push_back(std::pair<int, int>(mi.vertex_indexes.size(), mi.vertices.size())); mi.vertex_index_bases.push_back(std::pair<int, int>((int)mi.vertex_indexes.size(), (int)mi.vertices.size()));
vertex_index_offset = 0; vertex_index_offset = 0;
vertex_index_base_start_vertex = mi.vertices.size(); vertex_index_base_start_vertex = mi.vertices.size();
} }
@@ -1452,7 +1452,7 @@ void KRMesh::convertToIndexed()
} }
if(vertex_index_offset + vertex_count > 0xffff) { if(vertex_index_offset + vertex_count > 0xffff) {
mi.vertex_index_bases.push_back(std::pair<int, int>(mi.vertex_indexes.size(), mi.vertices.size())); mi.vertex_index_bases.push_back(std::pair<int, int>((int)mi.vertex_indexes.size(), (int)mi.vertices.size()));
vertex_index_offset = 0; vertex_index_offset = 0;
vertex_index_base_start_vertex = mi.vertices.size(); vertex_index_base_start_vertex = mi.vertices.size();
} }