asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Turn some prints to error logs, remove others

Browse source 
Fixes #5876 in passing.
This commit is contained in:
Rémi Verschelde 2016-07-24 00:02:19 +02:00
parent ebefdaa598
commit 308d405c31
5 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/io/image_loader.cpp
View file

@ -51,7 +51,7 @@ Error ImageLoader::load_image(String p_file,Image *p_image, FileAccess *p_custom
Error err; Error err;
f=FileAccess::open(p_file,FileAccess::READ,&err); f=FileAccess::open(p_file,FileAccess::READ,&err);
if (!f) { if (!f) {
print_line("ERROR OPENING FILE: "+p_file); ERR_PRINTS("Error opening file: "+p_file);
return err; return err;
} }
} }
@ -76,7 +76,6 @@ Error ImageLoader::load_image(String p_file,Image *p_image, FileAccess *p_custom
} }
print_line("NO LOADER?");
if (!p_custom) if (!p_custom)
memdelete(f); memdelete(f);

14
core/math/geometry.cpp
View file

@ -629,7 +629,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
// create and initialize cells to zero // create and initialize cells to zero
print_line("Wrapper: Initializing Cells"); //print_line("Wrapper: Initializing Cells");
uint8_t ***cell_status=memnew_arr(uint8_t**,div_x); uint8_t ***cell_status=memnew_arr(uint8_t**,div_x);
for(int i=0;i<div_x;i++) { for(int i=0;i<div_x;i++) {
@ -648,7 +648,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
} }
// plot faces into cells // plot faces into cells
print_line("Wrapper (1/6): Plotting Faces"); //print_line("Wrapper (1/6): Plotting Faces");
for (int i=0;i<face_count;i++) { for (int i=0;i<face_count;i++) {
@ -663,7 +663,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
// determine which cells connect to the outside by traversing the outside and recursively flood-fill marking // determine which cells connect to the outside by traversing the outside and recursively flood-fill marking
print_line("Wrapper (2/6) Flood Filling"); //print_line("Wrapper (2/6): Flood Filling");
for (int i=0;i<div_x;i++) { for (int i=0;i<div_x;i++) {
@ -694,7 +694,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
// build faces for the inside-outside cell divisors // build faces for the inside-outside cell divisors
print_line("Wrapper (3/6): Building Faces"); //print_line("Wrapper (3/6): Building Faces");
DVector<Face3> wrapped_faces; DVector<Face3> wrapped_faces;
@ -709,7 +709,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
} }
} }
print_line("Wrapper (4/6): Transforming Back Vertices"); //print_line("Wrapper (4/6): Transforming Back Vertices");
// transform face vertices to global coords // transform face vertices to global coords
@ -728,7 +728,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
} }
// clean up grid // clean up grid
print_line("Wrapper (5/6): Grid Cleanup"); //print_line("Wrapper (5/6): Grid Cleanup");
for(int i=0;i<div_x;i++) { for(int i=0;i<div_x;i++) {
@ -744,7 +744,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
if (p_error) if (p_error)
*p_error=voxelsize.length(); *p_error=voxelsize.length();
print_line("Wrapper (6/6): Finished."); //print_line("Wrapper (6/6): Finished.");
return wrapped_faces; return wrapped_faces;
} }

2
core/object_type_db.cpp
View file

@ -828,7 +828,7 @@ MethodBind* ObjectTypeDB::bind_methodfi(uint32_t p_flags, MethodBind *p_bind , c
TypeInfo *type=types.getptr(instance_type); TypeInfo *type=types.getptr(instance_type);
if (!type) { if (!type) {
print_line("couldn't bind method "+mdname+" for instance: "+instance_type); ERR_PRINTS("Couldn't bind method '"+mdname+"' for instance: "+instance_type);
memdelete(p_bind); memdelete(p_bind);
ERR_FAIL_COND_V(!type,NULL); ERR_FAIL_COND_V(!type,NULL);
} }

2
tools/editor/editor_file_system.cpp
View file

@ -657,7 +657,7 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir,DirAccess
da->change_dir(".."); da->change_dir("..");
} }
} else { } else {
ERR_PRINTS(TTR("Cannot go into subdir:")+" "+E->get()); ERR_PRINTS("Cannot go into subdir: "+E->get());
} }
p_progress.update(idx,total); p_progress.update(idx,total);

1
tools/editor/io_plugins/editor_mesh_import_plugin.cpp
View file

@ -496,7 +496,6 @@ Error EditorMeshImportPlugin::import(const String& p_path, const Ref<ResourceImp
} }
int vtx = face[idx][0].to_int()-1; int vtx = face[idx][0].to_int()-1;
print_line("vtx: "+itos(vtx)+"/"+itos(vertices.size()));
ERR_FAIL_INDEX_V(vtx,vertices.size(),ERR_PARSE_ERROR); ERR_FAIL_INDEX_V(vtx,vertices.size(),ERR_PARSE_ERROR);
Vector3 vertex = vertices[vtx]; Vector3 vertex = vertices[vtx];