godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid thekla_unwrap crash

Browse Source 
Godot crashed here sometimes by generating the uv map.
This commit is contained in:
Martin Capitanio 2017-12-28 01:07:51 +01:00
parent 0294887a0c
commit 1df63bf3cb
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/thekla_unwrap/register_types.cpp
View File

@ -28,7 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "register_types.h" #include "register_types.h"
#include "error_macros.h"
#include "thirdparty/thekla_atlas/thekla/thekla_atlas.h" #include "thirdparty/thekla_atlas/thekla/thekla_atlas.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
extern bool (*array_mesh_lightmap_unwrap_callback)(float p_texel_size, const float *p_vertices, const float *p_normals, int p_vertex_count, const int *p_indices, const int *p_face_materials, int p_index_count, float **r_uv, int **r_vertex, int *r_vertex_count, int **r_index, int *r_index_count, int *r_size_hint_x, int *r_size_hint_y); extern bool (*array_mesh_lightmap_unwrap_callback)(float p_texel_size, const float *p_vertices, const float *p_normals, int p_vertex_count, const int *p_indices, const int *p_face_materials, int p_index_count, float **r_uv, int **r_vertex, int *r_vertex_count, int **r_index, int *r_index_count, int *r_size_hint_x, int *r_size_hint_y);
@ -74,6 +76,11 @@ bool thekla_mesh_lightmap_unwrap_callback(float p_texel_size, const float *p_ver
delete[] input_mesh.face_array; delete[] input_mesh.face_array;
delete[] input_mesh.vertex_array; delete[] input_mesh.vertex_array;
if (output == NULL) {
ERR_PRINT("could not generate atlas output mesh");
return false;
}
if (err != Thekla::Atlas_Error_Success) { if (err != Thekla::Atlas_Error_Success) {
printf("error with atlas\n"); printf("error with atlas\n");
} else { } else {

6
thirdparty/thekla_atlas/nvmesh/param/AtlasPacker.cpp vendored
View File

@ -467,7 +467,11 @@ void AtlasPacker::packCharts(int quality, float texelsPerUnit, bool blockAligned
nvDebug("origin: %f %f\n", origin.x, origin.y); nvDebug("origin: %f %f\n", origin.x, origin.y);
nvDebug("majorAxis: %f %f\n", majorAxis.x, majorAxis.y); nvDebug("majorAxis: %f %f\n", majorAxis.x, majorAxis.y);
nvDebug("minorAxis: %f %f\n", minorAxis.x, minorAxis.y); nvDebug("minorAxis: %f %f\n", minorAxis.x, minorAxis.y);
nvDebugBreak(); // -- GODOT start --
//nvDebugBreak();
m_atlas->setFailed();
return;
// -- GODOT end --
} }
//nvCheck(tmp.x >= 0 && tmp.y >= 0); //nvCheck(tmp.x >= 0 && tmp.y >= 0);