Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Godot 3.0 primitives as resources for use with MeshInstance #8661

Merged
merged 1 commit into from
Jun 16, 2017
Merged

Godot 3.0 primitives as resources for use with MeshInstance #8661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions editor/spatial_editor_gizmos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,20 +1439,6 @@ VehicleWheelSpatialGizmo::VehicleWheelSpatialGizmo(VehicleWheel *p_car_wheel) {
car_wheel = p_car_wheel;
}

///

void TestCubeSpatialGizmo::redraw() {

clear();
add_collision_triangles(SpatialEditorGizmos::singleton->test_cube_tm);
}

TestCubeSpatialGizmo::TestCubeSpatialGizmo(TestCube *p_tc) {

tc = p_tc;
set_spatial_node(p_tc);
}

///////////

String CollisionShapeSpatialGizmo::get_handle_name(int p_idx) const {
Expand Down Expand Up @@ -3045,12 +3031,6 @@ Ref<SpatialEditorGizmo> SpatialEditorGizmos::get_gizmo(Spatial *p_spatial) {
return misg;
}

if (p_spatial->cast_to<TestCube>()) {

Ref<TestCubeSpatialGizmo> misg = memnew(TestCubeSpatialGizmo(p_spatial->cast_to<TestCube>()));
return misg;
}

if (p_spatial->cast_to<CollisionShape>()) {

Ref<CollisionShapeSpatialGizmo> misg = memnew(CollisionShapeSpatialGizmo(p_spatial->cast_to<CollisionShape>()));
Expand Down
12 changes: 0 additions & 12 deletions editor/spatial_editor_gizmos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
#include "scene/3d/ray_cast.h"
#include "scene/3d/reflection_probe.h"
#include "scene/3d/room_instance.h"
#include "scene/3d/test_cube.h"
#include "scene/3d/vehicle_body.h"
#include "scene/3d/visibility_notifier.h"

Expand Down Expand Up @@ -187,17 +186,6 @@ class SkeletonSpatialGizmo : public EditorSpatialGizmo {
SkeletonSpatialGizmo(Skeleton *p_skel = NULL);
};

class TestCubeSpatialGizmo : public EditorSpatialGizmo {

GDCLASS(TestCubeSpatialGizmo, EditorSpatialGizmo);

TestCube *tc;

public:
void redraw();
TestCubeSpatialGizmo(TestCube *p_tc = NULL);
};

class RoomSpatialGizmo : public EditorSpatialGizmo {

GDCLASS(RoomSpatialGizmo, EditorSpatialGizmo);
Expand Down
7 changes: 1 addition & 6 deletions main/tests/test_gui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -87,10 +86,6 @@ class TestMainLoop : public SceneTree {
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") );
Expand Down Expand Up @@ -375,6 +370,6 @@ MainLoop *test() {

return memnew(TestMainLoop);
}
}
} // namespace TestGUI

#endif
226 changes: 0 additions & 226 deletions scene/3d/quad.cpp
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions scene/3d/quad.h
View file
Open in desktop

This file was deleted.

Loading