1 files changed, 20 insertions, 25 deletions

diff --git a/main/tests/test_render.cpp b/main/tests/test_render.cpp
index 62239a5cb5..d936dd72e7 100644
--- a/main/tests/test_render.cpp
+++ b/main/tests/test_render.cpp
@@ -36,14 +36,14 @@
 #include "core/os/main_loop.h"
 #include "core/os/os.h"
 #include "core/print_string.h"
-#include "servers/visual_server.h"
+#include "servers/display_server.h"
+#include "servers/rendering_server.h"
 
 #define OBJECT_COUNT 50
 
 namespace TestRender {
 
 class TestMainLoop : public MainLoop {
-
 	RID test_cube;
 	RID instance;
 	RID camera;
@@ -52,7 +52,6 @@ class TestMainLoop : public MainLoop {
 	RID scenario;
 
 	struct InstanceInfo {
-
 		RID instance;
 		Transform base;
 		Vector3 rot_axis;
@@ -66,23 +65,22 @@ class TestMainLoop : public MainLoop {
 protected:
 public:
 	virtual void input_event(const Ref<InputEvent> &p_event) {
-
-		if (p_event->is_pressed())
+		if (p_event->is_pressed()) {
 			quit = true;
+		}
 	}
 
 	virtual void init() {
-
 		print_line("INITIALIZING TEST RENDER");
-		VisualServer *vs = VisualServer::get_singleton();
+		RenderingServer *vs = RenderingServer::get_singleton();
 		test_cube = vs->get_test_cube();
 		scenario = vs->scenario_create();
 
 		Vector<Vector3> vts;
 
 		/*
-		Vector<Plane> sp = Geometry::build_sphere_planes(2,5,5);
-		Geometry::MeshData md2 = Geometry::build_convex_mesh(sp);
+		Vector<Plane> sp = Geometry3D::build_sphere_planes(2,5,5);
+		Geometry3D::MeshData md2 = Geometry3D::build_convex_mesh(sp);
 		vts=md2.vertices;
 */
 		/*
@@ -120,12 +118,12 @@ public:
 		vts.push_back(Vector3(-1, 1, -1));
 		vts.push_back(Vector3(-1, -1, -1));
 
-		Geometry::MeshData md;
+		Geometry3D::MeshData md;
 		Error err = QuickHull::build(vts, md);
 		print_line("ERR: " + itos(err));
 		test_cube = vs->mesh_create();
 		vs->mesh_add_surface_from_mesh_data(test_cube, md);
-		//vs->scenario_set_debug(scenario,VS::SCENARIO_DEBUG_WIREFRAME);
+		//vs->scenario_set_debug(scenario,RS::SCENARIO_DEBUG_WIREFRAME);
 
 		/*
 		RID sm = vs->shader_create();
@@ -143,7 +141,6 @@ public:
 		};
 
 		for (int i = 0; i < object_count; i++) {
-
 			InstanceInfo ii;
 
 			ii.instance = vs->instance_create2(test_cube, scenario);
@@ -163,7 +160,7 @@ public:
 		// 		vs->camera_set_perspective( camera, 60.0,0.1, 100.0 );
 
 		viewport = vs->viewport_create();
-		Size2i screen_size = OS::get_singleton()->get_window_size();
+		Size2i screen_size = DisplayServer::get_singleton()->window_get_size();
 		vs->viewport_set_size(viewport, screen_size.x, screen_size.y);
 		vs->viewport_attach_to_screen(viewport, Rect2(Vector2(), screen_size));
 		vs->viewport_set_active(viewport, true);
@@ -173,16 +170,16 @@ public:
 		vs->camera_set_perspective(camera, 60, 0.1, 1000);
 
 		/*
-		RID lightaux = vs->light_create( VisualServer::LIGHT_OMNI );
-		vs->light_set_var( lightaux, VisualServer::LIGHT_VAR_RADIUS, 80 );
-		vs->light_set_var( lightaux, VisualServer::LIGHT_VAR_ATTENUATION, 1 );
-		vs->light_set_var( lightaux, VisualServer::LIGHT_VAR_ENERGY, 1.5 );
+		RID lightaux = vs->light_create( RenderingServer::LIGHT_OMNI );
+		vs->light_set_var( lightaux, RenderingServer::LIGHT_VAR_RADIUS, 80 );
+		vs->light_set_var( lightaux, RenderingServer::LIGHT_VAR_ATTENUATION, 1 );
+		vs->light_set_var( lightaux, RenderingServer::LIGHT_VAR_ENERGY, 1.5 );
 		light = vs->instance_create( lightaux );
 		*/
 		RID lightaux;
 
 		lightaux = vs->directional_light_create();
-		//vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_AMBIENT, Color(0.0,0.0,0.0) );
+		//vs->light_set_color( lightaux, RenderingServer::LIGHT_COLOR_AMBIENT, Color(0.0,0.0,0.0) );
 		vs->light_set_color(lightaux, Color(1.0, 1.0, 1.0));
 		//vs->light_set_shadow( lightaux, true );
 		light = vs->instance_create2(lightaux, scenario);
@@ -193,10 +190,10 @@ public:
 		vs->instance_set_transform(light, lla);
 
 		lightaux = vs->omni_light_create();
-		//vs->light_set_color( lightaux, VisualServer::LIGHT_COLOR_AMBIENT, Color(0.0,0.0,1.0) );
+		//vs->light_set_color( lightaux, RenderingServer::LIGHT_COLOR_AMBIENT, Color(0.0,0.0,1.0) );
 		vs->light_set_color(lightaux, Color(1.0, 1.0, 0.0));
-		vs->light_set_param(lightaux, VisualServer::LIGHT_PARAM_RANGE, 4);
-		vs->light_set_param(lightaux, VisualServer::LIGHT_PARAM_ENERGY, 8);
+		vs->light_set_param(lightaux, RenderingServer::LIGHT_PARAM_RANGE, 4);
+		vs->light_set_param(lightaux, RenderingServer::LIGHT_PARAM_ENERGY, 8);
 		//vs->light_set_shadow( lightaux, true );
 		//light = vs->instance_create( lightaux );
 
@@ -204,8 +201,7 @@ public:
 		quit = false;
 	}
 	virtual bool iteration(float p_time) {
-
-		VisualServer *vs = VisualServer::get_singleton();
+		RenderingServer *vs = RenderingServer::get_singleton();
 		//Transform t;
 		//t.rotate(Vector3(0, 1, 0), ofs);
 		//t.translate(Vector3(0,0,20 ));
@@ -216,7 +212,6 @@ public:
 		//return quit;
 
 		for (List<InstanceInfo>::Element *E = instances.front(); E; E = E->next()) {
-
 			Transform pre(Basis(E->get().rot_axis, ofs), Vector3());
 			vs->instance_set_transform(E->get().instance, pre * E->get().base);
 			/*
@@ -239,7 +234,7 @@ public:
 };
 
 MainLoop *test() {
-
 	return memnew(TestMainLoop);
 }
+
 } // namespace TestRender