asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable material editor preview to be rotated.

Browse source
This commit is contained in:
Anilforextra 2022-09-07 11:02:57 +05:45
parent 5fb84e5702
commit d4ee903004
2 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
editor/plugins/material_editor_plugin.cpp
View file

@ -40,6 +40,19 @@
#include "scene/resources/particle_process_material.h" #include "scene/resources/particle_process_material.h"
#include "scene/resources/sky_material.h" #include "scene/resources/sky_material.h"
void MaterialEditor::gui_input(const Ref<InputEvent> &p_event) {
ERR_FAIL_COND(p_event.is_null());
Ref<InputEventMouseMotion> mm = p_event;
if (mm.is_valid() && (mm->get_button_mask() & MouseButton::MASK_LEFT) != MouseButton::NONE) {
rot.x -= mm->get_relative().y * 0.01;
rot.y -= mm->get_relative().x * 0.01;
rot.x = CLAMP(rot.x, -Math_PI / 2, Math_PI / 2);
_update_rotation();
}
}
void MaterialEditor::_update_theme_item_cache() { void MaterialEditor::_update_theme_item_cache() {
Control::_update_theme_item_cache(); Control::_update_theme_item_cache();
@ -77,6 +90,13 @@ void MaterialEditor::_notification(int p_what) {
} }
} }
void MaterialEditor::_update_rotation() {
Transform3D t;
t.basis.rotate(Vector3(0, 1, 0), -rot.y);
t.basis.rotate(Vector3(1, 0, 0), -rot.x);
rotation->set_transform(t);
}
void MaterialEditor::edit(Ref<Material> p_material, const Ref<Environment> &p_env) { void MaterialEditor::edit(Ref<Material> p_material, const Ref<Environment> &p_env) {
material = p_material; material = p_material;
camera->set_environment(p_env); camera->set_environment(p_env);
@ -102,6 +122,10 @@ void MaterialEditor::edit(Ref<Material> p_material, const Ref<Environment> &p_en
} else { } else {
hide(); hide();
} }
rot.x = Math::deg_to_rad(-15.0);
rot.y = Math::deg_to_rad(30.0);
_update_rotation();
} }
void MaterialEditor::_button_pressed(Node *p_button) { void MaterialEditor::_button_pressed(Node *p_button) {
@ -130,9 +154,6 @@ void MaterialEditor::_button_pressed(Node *p_button) {
} }
} }
void MaterialEditor::_bind_methods() {
}
MaterialEditor::MaterialEditor() { MaterialEditor::MaterialEditor() {
// canvas item // canvas item
@ -163,7 +184,7 @@ MaterialEditor::MaterialEditor() {
viewport->set_msaa_3d(Viewport::MSAA_4X); viewport->set_msaa_3d(Viewport::MSAA_4X);
camera = memnew(Camera3D); camera = memnew(Camera3D);
camera->set_transform(Transform3D(Basis(), Vector3(0, 0, 3))); camera->set_transform(Transform3D(Basis(), Vector3(0, 0, 1.1)));
// Use low field of view so the sphere/box is fully encompassed within the preview, // Use low field of view so the sphere/box is fully encompassed within the preview,
// without much distortion. // without much distortion.
camera->set_perspective(20, 0.1, 10); camera->set_perspective(20, 0.1, 10);
@ -183,18 +204,17 @@ MaterialEditor::MaterialEditor() {
light2->set_color(Color(0.7, 0.7, 0.7)); light2->set_color(Color(0.7, 0.7, 0.7));
viewport->add_child(light2); viewport->add_child(light2);
rotation = memnew(Node3D);
viewport->add_child(rotation);
sphere_instance = memnew(MeshInstance3D); sphere_instance = memnew(MeshInstance3D);
viewport->add_child(sphere_instance); rotation->add_child(sphere_instance);
box_instance = memnew(MeshInstance3D); box_instance = memnew(MeshInstance3D);
viewport->add_child(box_instance); rotation->add_child(box_instance);
Transform3D box_xform; box_instance->set_transform(Transform3D() * 0.25);
box_xform.basis.rotate(Vector3(1, 0, 0), Math::deg_to_rad(25.0)); sphere_instance->set_transform(Transform3D() * 0.375);
box_xform.basis = box_xform.basis * Basis().rotated(Vector3(0, 1, 0), Math::deg_to_rad(-25.0));
box_xform.basis.scale(Vector3(0.7, 0.7, 0.7));
box_xform.origin.y = 0.05;
box_instance->set_transform(box_xform);
sphere_mesh.instantiate(); sphere_mesh.instantiate();
sphere_instance->set_mesh(sphere_mesh); sphere_instance->set_mesh(sphere_mesh);

6
editor/plugins/material_editor_plugin.h
View file

@ -45,11 +45,14 @@ class SubViewportContainer;
class MaterialEditor : public Control { class MaterialEditor : public Control {
GDCLASS(MaterialEditor, Control); GDCLASS(MaterialEditor, Control);
Vector2 rot = Vector2();
HBoxContainer *layout_2d = nullptr; HBoxContainer *layout_2d = nullptr;
ColorRect *rect_instance = nullptr; ColorRect *rect_instance = nullptr;
SubViewportContainer *vc = nullptr; SubViewportContainer *vc = nullptr;
SubViewport *viewport = nullptr; SubViewport *viewport = nullptr;
Node3D *rotation = nullptr;
MeshInstance3D *sphere_instance = nullptr; MeshInstance3D *sphere_instance = nullptr;
MeshInstance3D *box_instance = nullptr; MeshInstance3D *box_instance = nullptr;
DirectionalLight3D *light1 = nullptr; DirectionalLight3D *light1 = nullptr;
@ -87,7 +90,8 @@ class MaterialEditor : public Control {
protected: protected:
virtual void _update_theme_item_cache() override; virtual void _update_theme_item_cache() override;
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods(); void gui_input(const Ref<InputEvent> &p_event) override;
void _update_rotation();
public: public:
void edit(Ref<Material> p_material, const Ref<Environment> &p_env); void edit(Ref<Material> p_material, const Ref<Environment> &p_env);