summaryrefslogtreecommitdiff
path: root/main/tests
diff options
context:
space:
mode:
authorBastiaanOlij <mux213@gmail.com>2017-05-06 10:17:21 +1000
committerBastiaanOlij <mux213@gmail.com>2017-06-16 21:40:23 +1000
commit94836131388f575f79a5f0b077227f3a7a53af40 (patch)
treea6c88ed94f4928f10db8da7f9bdfce6854e15b05 /main/tests
parent80929d36bedebb3ed2d68185fd099253307b30aa (diff)
Godot 3.0 primitives as resources for use with MeshInstance
Adds the following resources: - CapsuleMesh: a capsule object - CubeMesh: a cube that can be subdivided - CylinderMesh: a cylinder - PlaneMesh: a horizontal plane that can be subdivided - PrismMesh: a prism shape - SphereMesh: a sphere - QuadMesh: reintroduction of the original quadmesh Removes the old Quad and TestCube nodes
Diffstat (limited to 'main/tests')
-rw-r--r--main/tests/test_gui.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/main/tests/test_gui.cpp b/main/tests/test_gui.cpp
index 3d0b96ae5b..291a557d04 100644
--- a/main/tests/test_gui.cpp
+++ b/main/tests/test_gui.cpp
@@ -53,7 +53,6 @@
#include "scene/main/scene_main_loop.h"
#include "scene/3d/camera.h"
-#include "scene/3d/test_cube.h"
#include "scene/main/viewport.h"
namespace TestGUI {
@@ -87,10 +86,6 @@ public:
vp->add_child(camera);
camera->make_current();
- TestCube *testcube = memnew( TestCube );
- vp->add_child(testcube);
- testcube->set_transform(Transform( Basis().rotated(Vector3(0,1,0),Math_PI*0.25), Vector3(0,0,-8)));
-
Sprite *sp = memnew( Sprite );
sp->set_texture( vp->get_render_target_texture() );
//sp->set_texture( ResourceLoader::load("res://ball.png") );
@@ -375,6 +370,6 @@ MainLoop *test() {
return memnew(TestMainLoop);
}
-}
+} // namespace TestGUI
#endif