diff options
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/tests/test_detailer.cpp | 2 | ||||
| -rw-r--r-- | bin/tests/test_gui.cpp | 4 | ||||
| -rw-r--r-- | bin/tests/test_misc.cpp | 4 | ||||
| -rw-r--r-- | bin/tests/test_particles.cpp | 2 | ||||
| -rw-r--r-- | bin/tests/test_render.cpp | 4 | ||||
| -rw-r--r-- | bin/tests/test_shader_lang.cpp | 4 |
6 files changed, 11 insertions, 9 deletions
diff --git a/bin/tests/test_detailer.cpp b/bin/tests/test_detailer.cpp index 7eac6755d7..4cb927411a 100644 --- a/bin/tests/test_detailer.cpp +++ b/bin/tests/test_detailer.cpp @@ -176,7 +176,7 @@ public: vs->camera_set_transform(camera, Transform( Matrix3(), Vector3(0,0,2 ) ) ); RID lightaux = vs->light_create( VisualServer::LIGHT_DIRECTIONAL ); - vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_AMBIENT, Color(0.3,0.3,0.3) ); + //vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_AMBIENT, Color(0.3,0.3,0.3) ); light = vs->instance_create2( lightaux,scenario ); vs->instance_set_transform(light,Transform(Matrix3(Vector3(0.1,0.4,0.7).normalized(),0.9))); diff --git a/bin/tests/test_gui.cpp b/bin/tests/test_gui.cpp index f45fe358a6..f814b0282b 100644 --- a/bin/tests/test_gui.cpp +++ b/bin/tests/test_gui.cpp @@ -305,7 +305,7 @@ public: richtext->push_color(Color(1,0.5,0.5)); richtext->add_text("leprechauns"); richtext->pop(); -#if 0 + richtext->add_text(" and "); richtext->push_color(Color(0,1.0,0.5)); richtext->add_text("faeries.\n"); @@ -329,7 +329,7 @@ public: richtext->pop(); richtext->add_text("of the rich text label for huge text (not like this text will really be huge but, you know).\nAs long as it is so long that it will work nicely for a test/demo, then it's welcomed in my book...\nChanging subject, the day is cloudy today and I'm wondering if I'll get che chance to travel somewhere nice. Sometimes, watching the clouds from satellite images may give a nice insight about how pressure zones in our planet work, althogh it also makes it pretty obvious to see why most weather forecasts get it wrong so often.\nClouds are so difficult to predict!\nBut it's pretty cool how our civilization has adapted to having water falling from the sky each time it rains..."); //richtext->add_text("Hello!\nGorgeous.."); -#endif + //richtext->push_meta("http://www.scrollingcapabilities.xz"); ///richtext->add_text("Hello!\n"); diff --git a/bin/tests/test_misc.cpp b/bin/tests/test_misc.cpp index 32d1bbf090..819afc0d06 100644 --- a/bin/tests/test_misc.cpp +++ b/bin/tests/test_misc.cpp @@ -407,7 +407,7 @@ public: RID cylinder_material = vs->fixed_material_create(); vs->fixed_material_set_param( cylinder_material, VisualServer::FIXED_MATERIAL_PARAM_DIFFUSE, Color(0.8,0.2,0.9)); vs->material_set_flag( cylinder_material, VisualServer::MATERIAL_FLAG_ONTOP,true); - vs->material_set_flag( cylinder_material, VisualServer::MATERIAL_FLAG_WIREFRAME,true); + //vs->material_set_flag( cylinder_material, VisualServer::MATERIAL_FLAG_WIREFRAME,true); vs->material_set_flag( cylinder_material, VisualServer::MATERIAL_FLAG_DOUBLE_SIDED,true); vs->material_set_flag( cylinder_material, VisualServer::MATERIAL_FLAG_UNSHADED,true); @@ -429,7 +429,7 @@ public: light = vs->instance_create2( lightaux ); */ RID lightaux = vs->light_create( VisualServer::LIGHT_DIRECTIONAL ); - vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_AMBIENT, Color(0.0,0.0,0.0) ); + //vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_AMBIENT, Color(0.0,0.0,0.0) ); //vs->light_set_shadow( lightaux, true ); RID light = vs->instance_create2( lightaux,scenario ); diff --git a/bin/tests/test_particles.cpp b/bin/tests/test_particles.cpp index f6f526fb21..2ccbb31017 100644 --- a/bin/tests/test_particles.cpp +++ b/bin/tests/test_particles.cpp @@ -87,7 +87,7 @@ public: light = vs->instance_create2( lightaux ); */ RID lightaux = vs->light_create( VisualServer::LIGHT_DIRECTIONAL ); - vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_AMBIENT, Color(0.0,0.0,0.0) ); + // vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_AMBIENT, Color(0.0,0.0,0.0) ); light = vs->instance_create2( lightaux, scenario ); ofs=0; diff --git a/bin/tests/test_render.cpp b/bin/tests/test_render.cpp index b45b356ee3..cad3658d84 100644 --- a/bin/tests/test_render.cpp +++ b/bin/tests/test_render.cpp @@ -185,7 +185,7 @@ public: //* lightaux = vs->light_create( VisualServer::LIGHT_DIRECTIONAL ); - vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_AMBIENT, Color(0.0,0.0,0.0) ); + //vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_AMBIENT, Color(0.0,0.0,0.0) ); vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_DIFFUSE, Color(1.0,1.0,1.0) ); //vs->light_set_shadow( lightaux, true ); light = vs->instance_create2( lightaux, scenario ); @@ -198,7 +198,7 @@ public: //* lightaux = vs->light_create( VisualServer::LIGHT_OMNI ); - vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_AMBIENT, Color(0.0,0.0,1.0) ); +// vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_AMBIENT, Color(0.0,0.0,1.0) ); vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_DIFFUSE, Color(1.0,1.0,0.0) ); vs->light_set_param( lightaux, VisualServer::LIGHT_PARAM_RADIUS, 4 ); vs->light_set_param( lightaux, VisualServer::LIGHT_PARAM_ENERGY, 8 ); diff --git a/bin/tests/test_shader_lang.cpp b/bin/tests/test_shader_lang.cpp index 3ee32fe1aa..059781b64c 100644 --- a/bin/tests/test_shader_lang.cpp +++ b/bin/tests/test_shader_lang.cpp @@ -264,13 +264,15 @@ static String dump_node_code(SL::Node *p_node,int p_level) { } -static void recreate_code(void *p_str,SL::ProgramNode *p_program) { +static Error recreate_code(void *p_str,SL::ProgramNode *p_program) { print_line("recr"); String *str=(String*)p_str; *str=dump_node_code(p_program,0); + return OK; + } |