1 files changed, 34 insertions, 17 deletions

diff --git a/editor/plugins/camera_3d_editor_plugin.cpp b/editor/plugins/camera_3d_editor_plugin.cpp
index 7bdeb151ea..71a3d4fad6 100644
--- a/editor/plugins/camera_3d_editor_plugin.cpp
+++ b/editor/plugins/camera_3d_editor_plugin.cpp
@@ -32,8 +32,11 @@
 
 #include "camera_3d_editor_plugin.h"
 
+#include "core/config/project_settings.h"
 #include "editor/editor_node.h"
 #include "node_3d_editor_plugin.h"
+#include "scene/gui/texture_rect.h"
+#include "scene/main/viewport.h"
 
 void Camera3DEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {
@@ -78,9 +81,35 @@ Camera3DEditor::Camera3DEditor() {
 	preview->connect(SceneStringName(pressed), callable_mp(this, &Camera3DEditor::_pressed));
 }
 
+void Camera3DPreview::_update_sub_viewport_size() {
+	sub_viewport->set_size(Node3DEditor::get_camera_viewport_size(camera));
+}
+
+Camera3DPreview::Camera3DPreview(Camera3D *p_camera) :
+		TexturePreview(nullptr, false), camera(p_camera), sub_viewport(memnew(SubViewport)) {
+	RenderingServer::get_singleton()->viewport_attach_camera(sub_viewport->get_viewport_rid(), camera->get_camera());
+	add_child(sub_viewport);
+
+	TextureRect *display = get_texture_display();
+	display->set_texture(sub_viewport->get_texture());
+	sub_viewport->connect("size_changed", callable_mp((CanvasItem *)display, &CanvasItem::queue_redraw));
+
+	ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Camera3DPreview::_update_sub_viewport_size));
+	_update_sub_viewport_size();
+}
+
+bool EditorInspectorPluginCamera3DPreview::can_handle(Object *p_object) {
+	return Object::cast_to<Camera3D>(p_object) != nullptr;
+}
+
+void EditorInspectorPluginCamera3DPreview::parse_begin(Object *p_object) {
+	Camera3D *camera = Object::cast_to<Camera3D>(p_object);
+	Camera3DPreview *preview = memnew(Camera3DPreview(camera));
+	add_custom_control(preview);
+}
+
 void Camera3DEditorPlugin::edit(Object *p_object) {
 	Node3DEditor::get_singleton()->set_can_preview(Object::cast_to<Camera3D>(p_object));
-	//camera_editor->edit(Object::cast_to<Node>(p_object));
 }
 
 bool Camera3DEditorPlugin::handles(Object *p_object) const {
@@ -88,27 +117,15 @@ bool Camera3DEditorPlugin::handles(Object *p_object) const {
 }
 
 void Camera3DEditorPlugin::make_visible(bool p_visible) {
-	if (p_visible) {
-		//Node3DEditor::get_singleton()->set_can_preview(Object::cast_to<Camera3D>(p_object));
-	} else {
+	if (!p_visible) {
 		Node3DEditor::get_singleton()->set_can_preview(nullptr);
 	}
 }
 
 Camera3DEditorPlugin::Camera3DEditorPlugin() {
-	/*	camera_editor = memnew( CameraEditor );
-	EditorNode::get_singleton()->get_main_screen_control()->add_child(camera_editor);
-
-	camera_editor->set_anchor(SIDE_LEFT,Control::ANCHOR_END);
-	camera_editor->set_anchor(SIDE_RIGHT,Control::ANCHOR_END);
-	camera_editor->set_offset(SIDE_LEFT,60);
-	camera_editor->set_offset(SIDE_RIGHT,0);
-	camera_editor->set_offset(SIDE_TOP,0);
-	camera_editor->set_offset(SIDE_BOTTOM,10);
-
-
-	camera_editor->hide();
-*/
+	Ref<EditorInspectorPluginCamera3DPreview> plugin;
+	plugin.instantiate();
+	add_inspector_plugin(plugin);
 }
 
 Camera3DEditorPlugin::~Camera3DEditorPlugin() {