godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
godot/editor/plugins/spatial_editor_plugin.cpp

5348 lines
174 KiB
C++
Raw Normal View History

GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/*************************************************************************/
/* spatial_editor_plugin.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
Use HTTPS URL for Godot's website in the headers
2017-08-27 12:16:55 +00:00
/* https://godotengine.org */
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/*************************************************************************/
Welcome in 2017, dear changelog reader! That year should bring the long-awaited OpenGL ES 3.0 compatible renderer with state-of-the-art rendering techniques tuned to work as low as middle end handheld devices - without compromising with the possibilities given for higher end desktop games of course. Great times ahead for the Godot community and the gamers that will play our games!
2017-01-01 21:01:57 +00:00
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
Add "Godot Engine contributors" copyright line
2017-04-07 22:11:42 +00:00
/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "spatial_editor_plugin.h"
#include "camera_matrix.h"
Implement warped mouse panning for 2D & 3D editors Enabled by default as in Blender, but can be disabled separately for 2D & 3D; the core functionality is in Input so this could be reused or even exposed to scripts in the future
2017-03-22 20:18:47 +00:00
#include "core/os/input.h"
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
#include "editor/animation_editor.h"
Refactoring: rename tools/editor/ to editor/ The other subfolders of tools/ had already been moved to either editor/, misc/ or thirdparty/, so the hiding the editor code that deep was no longer meaningful.
2017-03-05 13:21:25 +00:00
#include "editor/editor_node.h"
#include "editor/editor_settings.h"
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
#include "editor/plugins/animation_player_editor_plugin.h"
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
#include "editor/plugins/script_editor_plugin.h"
#include "editor/script_editor_debugger.h"
Refactoring: rename tools/editor/ to editor/ The other subfolders of tools/ had already been moved to either editor/, misc/ or thirdparty/, so the hiding the editor code that deep was no longer meaningful.
2017-03-05 13:21:25 +00:00
#include "editor/spatial_editor_gizmos.h"
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
#include "os/keyboard.h"
#include "print_string.h"
Added configurable modifier key to activate freelook
2017-07-23 00:02:18 +00:00
#include "project_settings.h"
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
#include "scene/3d/camera.h"
#include "scene/3d/visual_instance.h"
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
#include "scene/resources/packed_scene.h"
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
#include "scene/resources/surface_tool.h"
#include "sort.h"
-Massive editor dialog cleanup -Added a bottom menu list
2016-01-17 23:03:57 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
#define DISTANCE_DEFAULT 4
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
#define GIZMO_ARROW_SIZE 0.35
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
#define GIZMO_RING_HALF_WIDTH 0.1
//#define GIZMO_SCALE_DEFAULT 0.28
#define GIZMO_SCALE_DEFAULT 0.15
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
#define GIZMO_PLANE_SIZE 0.2
#define GIZMO_PLANE_DST 0.3
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
#define GIZMO_CIRCLE_SIZE 1.1
#define GIZMO_SCALE_OFFSET (GIZMO_CIRCLE_SIZE + 0.3)
#define GIZMO_ARROW_OFFSET (GIZMO_CIRCLE_SIZE + 0.3)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
#define ZOOM_MIN_DISTANCE 0.001
#define ZOOM_MULTIPLIER 1.08
#define ZOOM_INDICATOR_DELAY_S 1.5
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
#define FREELOOK_MIN_SPEED 0.01
#define FREELOOK_SPEED_MULTIPLIER 1.08
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
SpatialEditor: uniform min/max of fov,znear,zfar Clamp FOV to [0.01, 179], Znear and Zfar to [0.01, 10000]
2017-08-04 11:23:10 +00:00
#define MIN_Z 0.01
#define MAX_Z 10000
#define MIN_FOV 0.01
#define MAX_FOV 179
-Massive clean up to gizmos -Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
2017-08-26 03:40:45 +00:00
void SpatialEditorViewport::_update_camera(float p_interp_delta) {
-Fixed redraw always on 3D viewprot bug -Changed manipulation inertia default values. Do not touch them again or I'll cut your fingers and eat them.
2017-09-23 20:27:29 +00:00
bool is_orthogonal = camera->get_projection() == Camera::PROJECTION_ORTHOGONAL;
Fixes errors occurring when switching to a new scene with a spatial editor from a canvas editor.
2016-04-06 06:34:34 +00:00
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
Cursor old_camera_cursor = camera_cursor;
camera_cursor = cursor;
Fixed to InputDefault, button mask was wrong. Fixes to editor camera interpolation.
2017-09-16 15:12:11 +00:00
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
if (p_interp_delta > 0) {
Fixed to InputDefault, button mask was wrong. Fixes to editor camera interpolation.
2017-09-16 15:12:11 +00:00
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
//-------
// Perform smoothing
Fixed to InputDefault, button mask was wrong. Fixes to editor camera interpolation.
2017-09-16 15:12:11 +00:00
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
if (is_freelook_active()) {
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
// Higher inertia should increase "lag" (lerp with factor between 0 and 1)
// Inertia of zero should produce instant movement (lerp with factor of 1) in this case it returns a really high value and gets clamped to 1.
real_t inertia = EDITOR_GET("editors/3d/freelook/freelook_inertia");
inertia = MAX(0.001, inertia);
real_t factor = (1.0 / inertia) * p_interp_delta;
// We interpolate a different point here, because in freelook mode the focus point (cursor.pos) orbits around eye_pos
camera_cursor.eye_pos = old_camera_cursor.eye_pos.linear_interpolate(cursor.eye_pos, CLAMP(factor, 0, 1));
//camera_cursor.pos = camera_cursor.eye_pos + (cursor.pos - cursor.eye_pos);
float orbit_inertia = EDITOR_GET("editors/3d/navigation_feel/orbit_inertia");
orbit_inertia = MAX(0.0001, orbit_inertia);
camera_cursor.x_rot = Math::lerp(old_camera_cursor.x_rot, cursor.x_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia)));
camera_cursor.y_rot = Math::lerp(old_camera_cursor.y_rot, cursor.y_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia)));
Vector3 forward = to_camera_transform(camera_cursor).basis.xform(Vector3(0, 0, -1));
camera_cursor.pos = camera_cursor.eye_pos + forward * camera_cursor.distance;
} else {
Changed camera interpolation to work when LMB is pressed and no modifiers are pressed
2017-08-26 12:10:57 +00:00
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
//when not being manipulated, move softly
float free_orbit_inertia = EDITOR_GET("editors/3d/navigation_feel/orbit_inertia");
float free_translation_inertia = EDITOR_GET("editors/3d/navigation_feel/translation_inertia");
//when being manipulated, move more quickly
float manip_orbit_inertia = EDITOR_GET("editors/3d/navigation_feel/manipulation_orbit_inertia");
float manip_translation_inertia = EDITOR_GET("editors/3d/navigation_feel/manipulation_translation_inertia");
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
float zoom_inertia = EDITOR_GET("editors/3d/navigation_feel/zoom_inertia");
Changed camera interpolation to work when LMB is pressed and no modifiers are pressed
2017-08-26 12:10:57 +00:00
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
//determine if being manipulated
bool manipulated = Input::get_singleton()->get_mouse_button_mask() & (2 | 4);
manipulated |= Input::get_singleton()->is_key_pressed(KEY_SHIFT);
manipulated |= Input::get_singleton()->is_key_pressed(KEY_ALT);
manipulated |= Input::get_singleton()->is_key_pressed(KEY_CONTROL);
float orbit_inertia = MAX(0.00001, manipulated ? manip_orbit_inertia : free_orbit_inertia);
float translation_inertia = MAX(0.0001, manipulated ? manip_translation_inertia : free_translation_inertia);
zoom_inertia = MAX(0.0001, zoom_inertia);
camera_cursor.x_rot = Math::lerp(old_camera_cursor.x_rot, cursor.x_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia)));
camera_cursor.y_rot = Math::lerp(old_camera_cursor.y_rot, cursor.y_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia)));
camera_cursor.pos = old_camera_cursor.pos.linear_interpolate(cursor.pos, MIN(1.f, p_interp_delta * (1 / translation_inertia)));
camera_cursor.distance = Math::lerp(old_camera_cursor.distance, cursor.distance, MIN(1.f, p_interp_delta * (1 / zoom_inertia)));
}
-Massive clean up to gizmos -Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
2017-08-26 03:40:45 +00:00
}
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
//-------
// Apply camera transform
-Fixed redraw always on 3D viewprot bug -Changed manipulation inertia default values. Do not touch them again or I'll cut your fingers and eat them.
2017-09-23 20:27:29 +00:00
float tolerance = 0.001;
-Massive clean up to gizmos -Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
2017-08-26 03:40:45 +00:00
bool equal = true;
-Fixed redraw always on 3D viewprot bug -Changed manipulation inertia default values. Do not touch them again or I'll cut your fingers and eat them.
2017-09-23 20:27:29 +00:00
if (Math::abs(old_camera_cursor.x_rot - camera_cursor.x_rot) > tolerance || Math::abs(old_camera_cursor.y_rot - camera_cursor.y_rot) > tolerance) {
Modify inertia implementation for freelook and orbit - freelook now uses position based inertia (holding a key for a specific time always rults in the same distance traveled independent of inertia setting) - orbit inertia now is angle bases. (not transformation based) -> camera always takes the same path. - added setting for orbit inertia - added setting hints for freelook settings.
2017-09-06 17:53:00 +00:00
equal = false;
-Fixed redraw always on 3D viewprot bug -Changed manipulation inertia default values. Do not touch them again or I'll cut your fingers and eat them.
2017-09-23 20:27:29 +00:00
}
-Massive clean up to gizmos -Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
2017-08-26 03:40:45 +00:00
-Fixed redraw always on 3D viewprot bug -Changed manipulation inertia default values. Do not touch them again or I'll cut your fingers and eat them.
2017-09-23 20:27:29 +00:00
if (equal && old_camera_cursor.pos.distance_squared_to(camera_cursor.pos) > tolerance * tolerance) {
-Massive clean up to gizmos -Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
2017-08-26 03:40:45 +00:00
equal = false;
-Fixed redraw always on 3D viewprot bug -Changed manipulation inertia default values. Do not touch them again or I'll cut your fingers and eat them.
2017-09-23 20:27:29 +00:00
}
-Massive clean up to gizmos -Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
2017-08-26 03:40:45 +00:00
-Fixed redraw always on 3D viewprot bug -Changed manipulation inertia default values. Do not touch them again or I'll cut your fingers and eat them.
2017-09-23 20:27:29 +00:00
if (equal && Math::abs(old_camera_cursor.distance - camera_cursor.distance) > tolerance) {
Modify inertia implementation for freelook and orbit - freelook now uses position based inertia (holding a key for a specific time always rults in the same distance traveled independent of inertia setting) - orbit inertia now is angle bases. (not transformation based) -> camera always takes the same path. - added setting for orbit inertia - added setting hints for freelook settings.
2017-09-06 17:53:00 +00:00
equal = false;
-Fixed redraw always on 3D viewprot bug -Changed manipulation inertia default values. Do not touch them again or I'll cut your fingers and eat them.
2017-09-23 20:27:29 +00:00
}
-Massive clean up to gizmos -Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
2017-08-26 03:40:45 +00:00
-Fixed redraw always on 3D viewprot bug -Changed manipulation inertia default values. Do not touch them again or I'll cut your fingers and eat them.
2017-09-23 20:27:29 +00:00
if (!equal || p_interp_delta == 0 || is_freelook_active() || is_orthogonal != orthogonal) {
-Massive clean up to gizmos -Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
2017-08-26 03:40:45 +00:00
Modify inertia implementation for freelook and orbit - freelook now uses position based inertia (holding a key for a specific time always rults in the same distance traveled independent of inertia setting) - orbit inertia now is angle bases. (not transformation based) -> camera always takes the same path. - added setting for orbit inertia - added setting hints for freelook settings.
2017-09-06 17:53:00 +00:00
camera->set_global_transform(to_camera_transform(camera_cursor));
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
update_transform_gizmo_view();
-Fixed redraw always on 3D viewprot bug -Changed manipulation inertia default values. Do not touch them again or I'll cut your fingers and eat them.
2017-09-23 20:27:29 +00:00
if (orthogonal) {
//camera->set_orthogonal(size.width*cursor.distance,get_znear(),get_zfar());
camera->set_orthogonal(2 * cursor.distance, 0.1, 8192);
} else
camera->set_perspective(get_fov(), get_znear(), get_zfar());
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
}
}
Transform SpatialEditorViewport::to_camera_transform(const Cursor &p_cursor) const {
Fixes errors occurring when switching to a new scene with a spatial editor from a canvas editor.
2016-04-06 06:34:34 +00:00
Transform camera_transform;
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
camera_transform.translate(p_cursor.pos);
camera_transform.basis.rotate(Vector3(1, 0, 0), -p_cursor.x_rot);
camera_transform.basis.rotate(Vector3(0, 1, 0), -p_cursor.y_rot);
Fixes errors occurring when switching to a new scene with a spatial editor from a canvas editor.
2016-04-06 06:34:34 +00:00
if (orthogonal)
camera_transform.translate(0, 0, 4096);
else
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
camera_transform.translate(0, 0, p_cursor.distance);
Fixes errors occurring when switching to a new scene with a spatial editor from a canvas editor.
2016-04-06 06:34:34 +00:00
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
return camera_transform;
Fixes errors occurring when switching to a new scene with a spatial editor from a canvas editor.
2016-04-06 06:34:34 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
String SpatialEditorGizmo::get_handle_name(int p_idx) const {
Fix EditorSpatialGizmo virtual functions not being called * Bind EditorSpatialGizmo::clear method
2016-07-09 16:10:13 +00:00
if (get_script_instance() && get_script_instance()->has_method("get_handle_name"))
return get_script_instance()->call("get_handle_name", p_idx);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return "";
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Variant SpatialEditorGizmo::get_handle_value(int p_idx) const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix EditorSpatialGizmo virtual functions not being called * Bind EditorSpatialGizmo::clear method
2016-07-09 16:10:13 +00:00
if (get_script_instance() && get_script_instance()->has_method("get_handle_value"))
return get_script_instance()->call("get_handle_value", p_idx);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return Variant();
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditorGizmo::set_handle(int p_idx, Camera *p_camera, const Point2 &p_point) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix EditorSpatialGizmo virtual functions not being called * Bind EditorSpatialGizmo::clear method
2016-07-09 16:10:13 +00:00
if (get_script_instance() && get_script_instance()->has_method("set_handle"))
get_script_instance()->call("set_handle", p_idx, p_camera, p_point);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditorGizmo::commit_handle(int p_idx, const Variant &p_restore, bool p_cancel) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix EditorSpatialGizmo virtual functions not being called * Bind EditorSpatialGizmo::clear method
2016-07-09 16:10:13 +00:00
if (get_script_instance() && get_script_instance()->has_method("commit_handle"))
get_script_instance()->call("commit_handle", p_idx, p_restore, p_cancel);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
bool SpatialEditorGizmo::intersect_frustum(const Camera *p_camera, const Vector<Plane> &p_frustum) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return false;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
bool SpatialEditorGizmo::intersect_ray(const Camera *p_camera, const Point2 &p_point, Vector3 &r_pos, Vector3 &r_normal, int *r_gizmo_handle, bool p_sec_first) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return false;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
SpatialEditorGizmo::SpatialEditorGizmo() {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
selected = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
int SpatialEditorViewport::get_selected_count() const {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Map<Node *, Object *> &selection = editor_selection->get_selection();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
int count = 0;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (Map<Node *, Object *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->key());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!sp)
continue;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
SpatialEditorSelectedItem *se = editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!se)
continue;
count++;
}
return count;
}
float SpatialEditorViewport::get_znear() const {
SpatialEditor: uniform min/max of fov,znear,zfar Clamp FOV to [0.01, 179], Znear and Zfar to [0.01, 10000]
2017-08-04 11:23:10 +00:00
return CLAMP(spatial_editor->get_znear(), MIN_Z, MAX_Z);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
float SpatialEditorViewport::get_zfar() const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
SpatialEditor: uniform min/max of fov,znear,zfar Clamp FOV to [0.01, 179], Znear and Zfar to [0.01, 10000]
2017-08-04 11:23:10 +00:00
return CLAMP(spatial_editor->get_zfar(), MIN_Z, MAX_Z);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
float SpatialEditorViewport::get_fov() const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
SpatialEditor: uniform min/max of fov,znear,zfar Clamp FOV to [0.01, 179], Znear and Zfar to [0.01, 10000]
2017-08-04 11:23:10 +00:00
return CLAMP(spatial_editor->get_fov(), MIN_FOV, MAX_FOV);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Transform SpatialEditorViewport::_get_camera_transform() const {
return camera->get_global_transform();
}
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
Vector3 SpatialEditorViewport::_get_camera_position() const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return _get_camera_transform().origin;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Point2 SpatialEditorViewport::_point_to_screen(const Vector3 &p_point) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Ability to shrink 3D viewport by half
2017-10-31 17:23:25 +00:00
return camera->unproject_position(p_point) * viewport_container->get_stretch_shrink();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector3 SpatialEditorViewport::_get_ray_pos(const Vector2 &p_pos) const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Ability to shrink 3D viewport by half
2017-10-31 17:23:25 +00:00
return camera->project_ray_origin(p_pos / viewport_container->get_stretch_shrink());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Vector3 SpatialEditorViewport::_get_camera_normal() const {
return -_get_camera_transform().basis.get_axis(2);
}
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
Vector3 SpatialEditorViewport::_get_ray(const Vector2 &p_pos) const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Ability to shrink 3D viewport by half
2017-10-31 17:23:25 +00:00
return camera->project_ray_normal(p_pos / viewport_container->get_stretch_shrink());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
/*
void SpatialEditorViewport::_clear_id(Spatial *p_node) {
editor_selection->remove_node(p_node);
}
*/
void SpatialEditorViewport::_clear_selected() {
editor_selection->clear();
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditorViewport::_select_clicked(bool p_append, bool p_single) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!clicked)
return;
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(ObjectDB::get_instance(clicked));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!sp)
return;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
_select(sp, clicked_wants_append, true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditorViewport::_select(Spatial *p_node, bool p_append, bool p_single) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!p_append) {
// should not modify the selection..
editor_selection->clear();
editor_selection->add_node(p_node);
} else {
if (editor_selection->is_selected(p_node) && p_single) {
//erase
editor_selection->remove_node(p_node);
} else {
editor_selection->add_node(p_node);
}
}
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ObjectID SpatialEditorViewport::_select_ray(const Point2 &p_pos, bool p_append, bool &r_includes_current, int *r_gizmo_handle, bool p_alt_select) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (r_gizmo_handle)
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
*r_gizmo_handle = -1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector3 ray = _get_ray(p_pos);
Vector3 pos = _get_ray_pos(p_pos);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector<ObjectID> instances = VisualServer::get_singleton()->instances_cull_ray(pos, ray, get_tree()->get_root()->get_world()->get_scenario());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Set<Ref<SpatialEditorGizmo> > found_gizmos;
-Massive clean up to gizmos -Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
2017-08-26 03:40:45 +00:00
Node *edited_scene = get_tree()->get_edited_scene_root();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ObjectID closest = 0;
Spatial *item = NULL;
float closest_dist = 1e20;
int selected_handle = -1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < instances.size(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *spat = Object::cast_to<Spatial>(ObjectDB::get_instance(instances[i]));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!spat)
continue;
Ref<SpatialEditorGizmo> seg = spat->get_gizmo();
ability to click on spatial subscene to select it
2017-08-09 16:40:02 +00:00
if ((!seg.is_valid()) || found_gizmos.has(seg)) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
ability to click on spatial subscene to select it
2017-08-09 16:40:02 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
found_gizmos.insert(seg);
Vector3 point;
Vector3 normal;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
int handle = -1;
bool inters = seg->intersect_ray(camera, p_pos, point, normal, NULL, p_alt_select);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!inters)
continue;
float dist = pos.distance_to(point);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (dist < 0)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
Several bugfixes, improving the import workflow
2017-02-06 03:38:39 +00:00
if (dist < closest_dist) {
-Massive clean up to gizmos -Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
2017-08-26 03:40:45 +00:00
//make sure that whathever is selected is editable
while (spat && spat != edited_scene && spat->get_owner() != edited_scene && !edited_scene->is_editable_instance(spat->get_owner())) {
spat = Object::cast_to<Spatial>(spat->get_owner());
}
if (spat) {
item = spat;
closest = spat->get_instance_id();
closest_dist = dist;
selected_handle = handle;
} else {
ERR_PRINT("Bug?");
}
Several bugfixes, improving the import workflow
2017-02-06 03:38:39 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
// if (editor_selection->is_selected(spat))
// r_includes_current=true;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Several bugfixes, improving the import workflow
2017-02-06 03:38:39 +00:00
if (!item)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return 0;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (!editor_selection->is_selected(item) || (r_gizmo_handle && selected_handle >= 0)) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (r_gizmo_handle)
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
*r_gizmo_handle = selected_handle;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Several bugfixes, improving the import workflow
2017-02-06 03:38:39 +00:00
return closest;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditorViewport::_find_items_at_pos(const Point2 &p_pos, bool &r_includes_current, Vector<_RayResult> &results, bool p_alt_select) {
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector3 ray = _get_ray(p_pos);
Vector3 pos = _get_ray_pos(p_pos);
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector<ObjectID> instances = VisualServer::get_singleton()->instances_cull_ray(pos, ray, get_tree()->get_root()->get_world()->get_scenario());
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
Set<Ref<SpatialEditorGizmo> > found_gizmos;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
r_includes_current = false;
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < instances.size(); i++) {
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *spat = Object::cast_to<Spatial>(ObjectDB::get_instance(instances[i]));
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
if (!spat)
continue;
Ref<SpatialEditorGizmo> seg = spat->get_gizmo();
if (!seg.is_valid())
continue;
if (found_gizmos.has(seg))
continue;
found_gizmos.insert(seg);
Vector3 point;
Vector3 normal;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
int handle = -1;
bool inters = seg->intersect_ray(camera, p_pos, point, normal, NULL, p_alt_select);
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
if (!inters)
continue;
float dist = pos.distance_to(point);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (dist < 0)
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
continue;
if (editor_selection->is_selected(spat))
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
r_includes_current = true;
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
_RayResult res;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
res.item = spat;
res.depth = dist;
res.handle = handle;
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
results.push_back(res);
}
if (results.empty())
return;
results.sort();
}
Updated function argument names
2017-08-12 16:52:50 +00:00
Vector3 SpatialEditorViewport::_get_screen_to_space(const Vector3 &p_vector3) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
CameraMatrix cm;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cm.set_perspective(get_fov(), get_size().aspect(), get_znear(), get_zfar());
float screen_w, screen_h;
cm.get_viewport_size(screen_w, screen_h);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Transform camera_transform;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
camera_transform.translate(cursor.pos);
camera_transform.basis.rotate(Vector3(1, 0, 0), -cursor.x_rot);
camera_transform.basis.rotate(Vector3(0, 1, 0), -cursor.y_rot);
camera_transform.translate(0, 0, cursor.distance);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Updated function argument names
2017-08-12 16:52:50 +00:00
return camera_transform.xform(Vector3(((p_vector3.x / get_size().width) * 2.0 - 1.0) * screen_w, ((1.0 - (p_vector3.y / get_size().height)) * 2.0 - 1.0) * screen_h, -get_znear()));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void SpatialEditorViewport::_select_region() {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (cursor.region_begin == cursor.region_end)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return; //nothing really
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector3 box[4] = {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3(
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
MIN(cursor.region_begin.x, cursor.region_end.x),
MIN(cursor.region_begin.y, cursor.region_end.y),
0),
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3(
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
MAX(cursor.region_begin.x, cursor.region_end.x),
MIN(cursor.region_begin.y, cursor.region_end.y),
0),
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3(
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
MAX(cursor.region_begin.x, cursor.region_end.x),
MAX(cursor.region_begin.y, cursor.region_end.y),
0),
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3(
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
MIN(cursor.region_begin.x, cursor.region_end.x),
MAX(cursor.region_begin.y, cursor.region_end.y),
0)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
};
Vector<Plane> frustum;
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
Vector3 cam_pos = _get_camera_position();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 4; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector3 a = _get_screen_to_space(box[i]);
Vector3 b = _get_screen_to_space(box[(i + 1) % 4]);
frustum.push_back(Plane(a, b, cam_pos));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Plane near(cam_pos, -_get_camera_normal());
near.d -= get_znear();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
frustum.push_back(near);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Plane far = -near;
far.d += 500.0;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
frustum.push_back(far);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector<ObjectID> instances = VisualServer::get_singleton()->instances_cull_convex(frustum, get_tree()->get_root()->get_world()->get_scenario());
Box selection for MeshInstances and subscene nodes.
2017-09-12 13:06:13 +00:00
Vector<Spatial *> selected;
Node *edited_scene = get_tree()->get_edited_scene_root();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < instances.size(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(ObjectDB::get_instance(instances[i]));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!sp)
continue;
Ref<SpatialEditorGizmo> seg = sp->get_gizmo();
if (!seg.is_valid())
continue;
Box selection for MeshInstances and subscene nodes.
2017-09-12 13:06:13 +00:00
Spatial *root_sp = sp;
while (root_sp && root_sp != edited_scene && root_sp->get_owner() != edited_scene && !edited_scene->is_editable_instance(root_sp->get_owner())) {
root_sp = Object::cast_to<Spatial>(root_sp->get_owner());
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Box selection for MeshInstances and subscene nodes.
2017-09-12 13:06:13 +00:00
if (selected.find(root_sp) == -1)
if (seg->intersect_frustum(camera, frustum))
_select(root_sp, true, false);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
void SpatialEditorViewport::_update_name() {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
String ortho = orthogonal ? TTR("Orthogonal") : TTR("Perspective");
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (name != "")
view_menu->set_text("[ " + name + " " + ortho + " ]");
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
else
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->set_text("[ " + ortho + " ]");
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditorViewport::_compute_edit(const Point2 &p_point) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
_edit.click_ray = _get_ray(Vector2(p_point.x, p_point.y));
_edit.click_ray_pos = _get_ray_pos(Vector2(p_point.x, p_point.y));
_edit.plane = TRANSFORM_VIEW;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
spatial_editor->update_transform_gizmo();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
_edit.center = spatial_editor->get_gizmo_transform().origin;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
List<Node *> &selection = editor_selection->get_selected_node_list();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->get());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!sp)
continue;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
SpatialEditorSelectedItem *se = editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!se)
continue;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
se->original = se->sp->get_global_transform();
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
se->original_local = se->sp->get_transform();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Added configurable modifier key to activate freelook
2017-07-23 00:02:18 +00:00
static int _get_key_modifier_setting(const String &p_property) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
switch (EditorSettings::get_singleton()->get(p_property).operator int()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case 0: return 0;
case 1: return KEY_SHIFT;
case 2: return KEY_ALT;
case 3: return KEY_META;
case 4: return KEY_CONTROL;
}
return 0;
}
Added configurable modifier key to activate freelook
2017-07-23 00:02:18 +00:00
static int _get_key_modifier(Ref<InputEventWithModifiers> e) {
if (e->get_shift())
return KEY_SHIFT;
if (e->get_alt())
return KEY_ALT;
if (e->get_control())
return KEY_CONTROL;
if (e->get_metakey())
return KEY_META;
return 0;
}
New customizable editor theme
2017-05-02 20:13:12 +00:00
bool SpatialEditorViewport::_gizmo_select(const Vector2 &p_screenpos, bool p_highlight_only) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!spatial_editor->is_gizmo_visible())
return false;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (get_selected_count() == 0) {
New customizable editor theme
2017-05-02 20:13:12 +00:00
if (p_highlight_only)
Fix highlight typo
2017-04-06 15:35:08 +00:00
spatial_editor->select_gizmo_highlight_axis(-1);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return false;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector3 ray_pos = _get_ray_pos(Vector2(p_screenpos.x, p_screenpos.y));
Vector3 ray = _get_ray(Vector2(p_screenpos.x, p_screenpos.y));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Transform gt = spatial_editor->get_gizmo_transform();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
float gs = gizmo_scale;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_MOVE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
int col_axis = -1;
float col_d = 1e20;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
Vector3 grabber_pos = gt.origin + gt.basis.get_axis(i) * gs * (GIZMO_ARROW_OFFSET + (GIZMO_ARROW_SIZE * 0.5));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
float grabber_radius = gs * GIZMO_ARROW_SIZE;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 r;
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (Geometry::segment_intersects_sphere(ray_pos, ray_pos + ray * 10000.0, grabber_pos, grabber_radius, &r)) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
float d = r.distance_to(ray_pos);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (d < col_d) {
col_d = d;
col_axis = i;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
}
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
bool is_plane_translate = false;
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
// plane select
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
if (col_axis == -1) {
col_d = 1e20;
for (int i = 0; i < 3; i++) {
Vector3 ivec2 = gt.basis.get_axis((i + 1) % 3).normalized();
Vector3 ivec3 = gt.basis.get_axis((i + 2) % 3).normalized();
Vector3 grabber_pos = gt.origin + (ivec2 + ivec3) * gs * (GIZMO_PLANE_SIZE + GIZMO_PLANE_DST);
Vector3 r;
Plane plane(gt.origin, gt.basis.get_axis(i).normalized());
if (plane.intersects_ray(ray_pos, ray, &r)) {
float dist = r.distance_to(grabber_pos);
if (dist < (gs * GIZMO_PLANE_SIZE)) {
float d = ray_pos.distance_to(r);
if (d < col_d) {
col_d = d;
col_axis = i;
is_plane_translate = true;
}
}
}
}
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (col_axis != -1) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
New customizable editor theme
2017-05-02 20:13:12 +00:00
if (p_highlight_only) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
spatial_editor->select_gizmo_highlight_axis(col_axis + (is_plane_translate ? 6 : 0));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
//handle plane translate
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
_edit.mode = TRANSFORM_TRANSLATE;
_compute_edit(Point2(p_screenpos.x, p_screenpos.y));
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
_edit.plane = TransformPlane(TRANSFORM_X_AXIS + col_axis + (is_plane_translate ? 3 : 0));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
return true;
}
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_ROTATE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
int col_axis = -1;
float col_d = 1e20;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Plane plane(gt.origin, gt.basis.get_axis(i).normalized());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 r;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (!plane.intersects_ray(ray_pos, ray, &r))
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
float dist = r.distance_to(gt.origin);
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
if (dist > gs * (GIZMO_CIRCLE_SIZE - GIZMO_RING_HALF_WIDTH) && dist < gs * (GIZMO_CIRCLE_SIZE + GIZMO_RING_HALF_WIDTH)) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
float d = ray_pos.distance_to(r);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (d < col_d) {
col_d = d;
col_axis = i;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (col_axis != -1) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
New customizable editor theme
2017-05-02 20:13:12 +00:00
if (p_highlight_only) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix highlight typo
2017-04-06 15:35:08 +00:00
spatial_editor->select_gizmo_highlight_axis(col_axis + 3);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
//handle rotate
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
_edit.mode = TRANSFORM_ROTATE;
_compute_edit(Point2(p_screenpos.x, p_screenpos.y));
_edit.plane = TransformPlane(TRANSFORM_X_AXIS + col_axis);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
return true;
}
}
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
if (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SCALE) {
int col_axis = -1;
float col_d = 1e20;
for (int i = 0; i < 3; i++) {
Vector3 grabber_pos = gt.origin + gt.basis.get_axis(i) * gs * GIZMO_SCALE_OFFSET;
float grabber_radius = gs * GIZMO_ARROW_SIZE;
Vector3 r;
if (Geometry::segment_intersects_sphere(ray_pos, ray_pos + ray * 10000.0, grabber_pos, grabber_radius, &r)) {
float d = r.distance_to(ray_pos);
if (d < col_d) {
col_d = d;
col_axis = i;
}
}
}
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
bool is_plane_scale = false;
// plane select
if (col_axis == -1) {
col_d = 1e20;
for (int i = 0; i < 3; i++) {
Vector3 ivec2 = gt.basis.get_axis((i + 1) % 3).normalized();
Vector3 ivec3 = gt.basis.get_axis((i + 2) % 3).normalized();
Vector3 grabber_pos = gt.origin + (ivec2 + ivec3) * gs * (GIZMO_PLANE_SIZE + GIZMO_PLANE_DST);
Vector3 r;
Plane plane(gt.origin, gt.basis.get_axis(i).normalized());
if (plane.intersects_ray(ray_pos, ray, &r)) {
float dist = r.distance_to(grabber_pos);
if (dist < (gs * GIZMO_PLANE_SIZE)) {
float d = ray_pos.distance_to(r);
if (d < col_d) {
col_d = d;
col_axis = i;
is_plane_scale = true;
}
}
}
}
}
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
if (col_axis != -1) {
if (p_highlight_only) {
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
spatial_editor->select_gizmo_highlight_axis(col_axis + (is_plane_scale ? 12 : 9));
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
} else {
//handle scale
_edit.mode = TRANSFORM_SCALE;
_compute_edit(Point2(p_screenpos.x, p_screenpos.y));
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
_edit.plane = TransformPlane(TRANSFORM_X_AXIS + col_axis + (is_plane_scale ? 3 : 0));
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
}
return true;
}
}
New customizable editor theme
2017-05-02 20:13:12 +00:00
if (p_highlight_only)
Fix highlight typo
2017-04-06 15:35:08 +00:00
spatial_editor->select_gizmo_highlight_axis(-1);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return false;
}
void SpatialEditorViewport::_smouseenter() {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (!surface->has_focus() && (!get_focus_owner() || !get_focus_owner()->is_text_field()))
surface->grab_focus();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
void SpatialEditorViewport::_smouseexit() {
_remove_preview();
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
void SpatialEditorViewport::_list_select(Ref<InputEventMouseButton> b) {
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
_find_items_at_pos(b->get_position(), clicked_includes_current, selection_results, b->get_shift());
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Node *scene = editor->get_edited_scene();
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < selection_results.size(); i++) {
Spatial *item = selection_results[i].item;
if (item != scene && item->get_owner() != scene && !scene->is_editable_instance(item->get_owner())) {
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
//invalid result
selection_results.remove(i);
i--;
}
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
clicked_wants_append = b->get_shift();
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
if (selection_results.size() == 1) {
Makes all Godot API's methods Lower Case
2017-08-07 10:17:31 +00:00
clicked = selection_results[0].item->get_instance_id();
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
selection_results.clear();
if (clicked) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
_select_clicked(clicked_wants_append, true);
clicked = 0;
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
}
} else if (!selection_results.empty()) {
NodePath root_path = get_tree()->get_edited_scene_root()->get_path();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
StringName root_name = root_path.get_name(root_path.get_name_count() - 1);
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
for (int i = 0; i < selection_results.size(); i++) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Spatial *spat = selection_results[i].item;
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
Ref<Texture> icon;
if (spat->has_meta("_editor_icon"))
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
icon = spat->get_meta("_editor_icon");
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
else
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
icon = get_icon(has_icon(spat->get_class(), "EditorIcons") ? spat->get_class() : String("Object"), "EditorIcons");
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
String node_path = "/" + root_name + "/" + root_path.rel_path_to(spat->get_path());
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
selection_menu->add_item(spat->get_name());
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
selection_menu->set_item_icon(i, icon);
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
selection_menu->set_item_metadata(i, node_path);
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
selection_menu->set_item_tooltip(i, String(spat->get_name()) + "\nType: " + spat->get_class() + "\nPath: " + node_path);
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
}
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
selection_menu->set_global_position(b->get_global_position());
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
selection_menu->popup();
selection_menu->call_deferred("grab_click_focus");
selection_menu->set_invalidate_click_until_motion();
}
}
Add option to use freelook with a toggle shortcut (like Blender) instead of holding RMB (like Unity)
2017-10-30 00:22:48 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (previewing)
return; //do NONE
{
EditorPlugin can request user inputs from editor 3d view
2017-06-08 17:57:35 +00:00
EditorNode *en = editor;
EditorPluginList *force_input_forwarding_list = en->get_editor_plugins_force_input_forwarding();
if (!force_input_forwarding_list->empty()) {
bool discard = force_input_forwarding_list->forward_spatial_gui_input(camera, p_event, true);
if (discard)
return;
}
}
{
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
EditorNode *en = editor;
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-29 23:02:53 +00:00
EditorPluginList *over_plugin_list = en->get_editor_plugins_over();
if (!over_plugin_list->empty()) {
EditorPlugin can request user inputs from editor 3d view
2017-06-08 17:57:35 +00:00
bool discard = over_plugin_list->forward_spatial_gui_input(camera, p_event, false);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (discard)
return;
}
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Ref<InputEventMouseButton> b = p_event;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (b.is_valid()) {
added precision scrolling to spatial editor zoom
2017-09-18 23:30:46 +00:00
float zoom_factor = 1 + (ZOOM_MULTIPLIER - 1) * b->get_factor();
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
switch (b->get_button_index()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case BUTTON_WHEEL_UP: {
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
if (is_freelook_active())
scale_freelook_speed(zoom_factor);
else
scale_cursor_distance(1.0 / zoom_factor);
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case BUTTON_WHEEL_DOWN: {
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
if (is_freelook_active())
scale_freelook_speed(1.0 / zoom_factor);
else
scale_cursor_distance(zoom_factor);
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case BUTTON_RIGHT: {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
settings 'editors/3d' organized, sorted, new_defaults
2017-09-19 00:30:48 +00:00
NavigationScheme nav_scheme = (NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (b->is_pressed() && _edit.gizmo.is_valid()) {
//restore
_edit.gizmo->commit_handle(_edit.gizmo_handle, _edit.gizmo_initial_value, true);
_edit.gizmo = Ref<SpatialEditorGizmo>();
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (_edit.mode == TRANSFORM_NONE && b->is_pressed()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (b->get_alt()) {
Show select menu on button pressed (instead of released)
2015-11-19 14:47:04 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (nav_scheme == NAVIGATION_MAYA)
break;
Show select menu on button pressed (instead of released)
2015-11-19 14:47:04 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_list_select(b);
return;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (_edit.mode != TRANSFORM_NONE && b->is_pressed()) {
//cancel motion
_edit.mode = TRANSFORM_NONE;
//_validate_selection();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
List<Node *> &selection = editor_selection->get_selected_node_list();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->get());
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (!sp)
continue;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
SpatialEditorSelectedItem *se = editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
if (!se)
continue;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
sp->set_global_transform(se->original);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
surface->update();
//VisualServer::get_singleton()->poly_clear(indicators);
set_message(TTR("Transform Aborted."), 3);
}
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Added configurable modifier key to activate freelook
2017-07-23 00:02:18 +00:00
if (b->is_pressed()) {
int mod = _get_key_modifier(b);
settings 'editors/3d' organized, sorted, new_defaults
2017-09-19 00:30:48 +00:00
if (mod == _get_key_modifier_setting("editors/3d/freelook/freelook_activation_modifier")) {
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
set_freelook_active(true);
Added configurable modifier key to activate freelook
2017-07-23 00:02:18 +00:00
}
} else {
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
set_freelook_active(false);
Added configurable modifier key to activate freelook
2017-07-23 00:02:18 +00:00
}
Fixed freelook conflict with text inputs
2017-06-20 00:24:35 +00:00
if (freelook_active && !surface->has_focus()) {
// Focus usually doesn't trigger on right-click, but in case of freelook it should,
// otherwise using keyboard navigation would misbehave
surface->grab_focus();
}
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
case BUTTON_MIDDLE: {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (b->is_pressed() && _edit.mode != TRANSFORM_NONE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
switch (_edit.plane) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case TRANSFORM_VIEW: {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_edit.plane = TRANSFORM_X_AXIS;
set_message(TTR("X-Axis Transform."), 2);
name = "";
_update_name();
} break;
case TRANSFORM_X_AXIS: {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_edit.plane = TRANSFORM_Y_AXIS;
set_message(TTR("Y-Axis Transform."), 2);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
case TRANSFORM_Y_AXIS: {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_edit.plane = TRANSFORM_Z_AXIS;
set_message(TTR("Z-Axis Transform."), 2);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
case TRANSFORM_Z_AXIS: {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_edit.plane = TRANSFORM_VIEW;
set_message(TTR("View Plane Transform."), 2);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
} break;
case BUTTON_LEFT: {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (b->is_pressed()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
settings 'editors/3d' organized, sorted, new_defaults
2017-09-19 00:30:48 +00:00
NavigationScheme nav_scheme = (NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int();
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if ((nav_scheme == NAVIGATION_MAYA || nav_scheme == NAVIGATION_MODO) && b->get_alt()) {
break;
}
Keep selection from been cleared when navigating in 3d viewport Conflicts: tools/editor/plugins/spatial_editor_plugin.cpp
2014-03-31 08:27:41 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_LIST_SELECT) {
_list_select(b);
break;
}
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
_edit.mouse_pos = b->get_position();
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_edit.snap = false;
_edit.mode = TRANSFORM_NONE;
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
//gizmo has priority over everything
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
bool can_select_gizmos = true;
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
{
int idx = view_menu->get_popup()->get_item_index(VIEW_GIZMOS);
can_select_gizmos = view_menu->get_popup()->is_item_checked(idx);
}
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (can_select_gizmos && spatial_editor->get_selected()) {
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Ref<SpatialEditorGizmo> seg = spatial_editor->get_selected()->get_gizmo();
if (seg.is_valid()) {
int handle = -1;
Vector3 point;
Vector3 normal;
bool inters = seg->intersect_ray(camera, _edit.mouse_pos, point, normal, &handle, b->get_shift());
if (inters && handle != -1) {
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_edit.gizmo = seg;
_edit.gizmo_handle = handle;
//_edit.gizmo_initial_pos=seg->get_handle_pos(gizmo_handle);
_edit.gizmo_initial_value = seg->get_handle_value(handle);
break;
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
}
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (_gizmo_select(_edit.mouse_pos))
break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
clicked = 0;
clicked_includes_current = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if ((spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SELECT && b->get_control()) || spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_ROTATE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
/* HANDLE ROTATION */
if (get_selected_count() == 0)
break; //bye
//handle rotate
_edit.mode = TRANSFORM_ROTATE;
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
_compute_edit(b->get_position());
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
break;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_MOVE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (get_selected_count() == 0)
break; //bye
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
//handle translate
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_edit.mode = TRANSFORM_TRANSLATE;
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
_compute_edit(b->get_position());
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
break;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SCALE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (get_selected_count() == 0)
break; //bye
ability to lock spatial nodes transform in editor
2017-10-23 19:21:15 +00:00
//handle scale
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_edit.mode = TRANSFORM_SCALE;
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
_compute_edit(b->get_position());
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
break;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
// todo scale
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
int gizmo_handle = -1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
clicked = _select_ray(b->get_position(), b->get_shift(), clicked_includes_current, &gizmo_handle, b->get_shift());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
//clicking is always deferred to either move or release
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
clicked_wants_append = b->get_shift();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (!clicked) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (!clicked_wants_append)
_clear_selected();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
//default to regionselect
cursor.region_select = true;
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
cursor.region_begin = b->get_position();
cursor.region_end = b->get_position();
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (clicked && gizmo_handle >= 0) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *spa = Object::cast_to<Spatial>(ObjectDB::get_instance(clicked));
if (spa) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Ref<SpatialEditorGizmo> seg = spa->get_gizmo();
if (seg.is_valid()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
_edit.gizmo = seg;
_edit.gizmo_handle = gizmo_handle;
//_edit.gizmo_initial_pos=seg->get_handle_pos(gizmo_handle);
_edit.gizmo_initial_value = seg->get_handle_value(gizmo_handle);
//print_line("GIZMO: "+itos(gizmo_handle)+" FROMPOS: "+_edit.orig_gizmo_pos);
break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
//_compute_edit(Point2(b.x,b.y)); //in case a motion happens..
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
surface->update();
} else {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (_edit.gizmo.is_valid()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_edit.gizmo->commit_handle(_edit.gizmo_handle, _edit.gizmo_initial_value, false);
_edit.gizmo = Ref<SpatialEditorGizmo>();
break;
}
if (clicked) {
_select_clicked(clicked_wants_append, true);
//clickd processing was deferred
clicked = 0;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (cursor.region_select) {
_select_region();
cursor.region_select = false;
surface->update();
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (_edit.mode != TRANSFORM_NONE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
static const char *_transform_name[4] = { "None", "Rotate", "Translate", "Scale" };
undo_redo->create_action(_transform_name[_edit.mode]);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
List<Node *> &selection = editor_selection->get_selected_node_list();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->get());
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (!sp)
continue;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
SpatialEditorSelectedItem *se = editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
if (!se)
continue;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
undo_redo->add_do_method(sp, "set_global_transform", sp->get_global_transform());
undo_redo->add_undo_method(sp, "set_global_transform", se->original);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
undo_redo->commit_action();
_edit.mode = TRANSFORM_NONE;
//VisualServer::get_singleton()->poly_clear(indicators);
set_message("");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
surface->update();
}
remove trailing whitespace
2016-05-21 13:29:25 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
}
}
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Ref<InputEventMouseMotion> m = p_event;
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (m.is_valid()) {
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
_edit.mouse_pos = m->get_position();
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (spatial_editor->get_selected()) {
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Ref<SpatialEditorGizmo> seg = spatial_editor->get_selected()->get_gizmo();
if (seg.is_valid()) {
int selected_handle = -1;
int handle = -1;
Vector3 point;
Vector3 normal;
bool inters = seg->intersect_ray(camera, _edit.mouse_pos, point, normal, &handle, false);
if (inters && handle != -1) {
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
selected_handle = handle;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (selected_handle != spatial_editor->get_over_gizmo_handle()) {
spatial_editor->set_over_gizmo_handle(selected_handle);
spatial_editor->get_selected()->update_gizmo();
if (selected_handle != -1)
spatial_editor->select_gizmo_highlight_axis(-1);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (spatial_editor->get_over_gizmo_handle() == -1 && !(m->get_button_mask() & 1) && !_edit.gizmo.is_valid()) {
remove trailing whitespace
2016-05-21 13:29:25 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_gizmo_select(_edit.mouse_pos, true);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
settings 'editors/3d' organized, sorted, new_defaults
2017-09-19 00:30:48 +00:00
NavigationScheme nav_scheme = (NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int();
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
NavigationMode nav_mode = NAVIGATION_NONE;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (_edit.gizmo.is_valid()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
_edit.gizmo->set_handle(_edit.gizmo_handle, camera, m->get_position());
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Variant v = _edit.gizmo->get_handle_value(_edit.gizmo_handle);
String n = _edit.gizmo->get_handle_name(_edit.gizmo_handle);
set_message(n + ": " + String(v));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} else if (m->get_button_mask() & BUTTON_MASK_LEFT) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (nav_scheme == NAVIGATION_MAYA && m->get_alt()) {
nav_mode = NAVIGATION_ORBIT;
} else if (nav_scheme == NAVIGATION_MODO && m->get_alt() && m->get_shift()) {
nav_mode = NAVIGATION_PAN;
} else if (nav_scheme == NAVIGATION_MODO && m->get_alt() && m->get_control()) {
nav_mode = NAVIGATION_ZOOM;
} else if (nav_scheme == NAVIGATION_MODO && m->get_alt()) {
nav_mode = NAVIGATION_ORBIT;
} else {
if (clicked) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (!clicked_includes_current) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_select_clicked(clicked_wants_append, true);
//clickd processing was deferred
Disable transform operation when navigation
2014-03-31 03:59:42 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_compute_edit(_edit.mouse_pos);
clicked = 0;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
_edit.mode = TRANSFORM_TRANSLATE;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (cursor.region_select && nav_mode == NAVIGATION_NONE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
cursor.region_end = m->get_position();
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
surface->update();
return;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (_edit.mode == TRANSFORM_NONE && nav_mode == NAVIGATION_NONE)
return;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
Vector3 ray_pos = _get_ray_pos(m->get_position());
Vector3 ray = _get_ray(m->get_position());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
switch (_edit.mode) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case TRANSFORM_SCALE: {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
Vector3 motion_mask;
Plane plane;
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
bool plane_mv = false;
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
switch (_edit.plane) {
case TRANSFORM_VIEW:
motion_mask = Vector3(0, 0, 0);
plane = Plane(_edit.center, _get_camera_normal());
break;
case TRANSFORM_X_AXIS:
motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(0);
plane = Plane(_edit.center, motion_mask.cross(motion_mask.cross(_get_camera_normal())).normalized());
break;
case TRANSFORM_Y_AXIS:
motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(1);
plane = Plane(_edit.center, motion_mask.cross(motion_mask.cross(_get_camera_normal())).normalized());
break;
case TRANSFORM_Z_AXIS:
motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(2);
plane = Plane(_edit.center, motion_mask.cross(motion_mask.cross(_get_camera_normal())).normalized());
break;
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
case TRANSFORM_YZ:
motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(2) + spatial_editor->get_gizmo_transform().basis.get_axis(1);
plane = Plane(_edit.center, spatial_editor->get_gizmo_transform().basis.get_axis(0));
plane_mv = true;
break;
case TRANSFORM_XZ:
motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(2) + spatial_editor->get_gizmo_transform().basis.get_axis(0);
plane = Plane(_edit.center, spatial_editor->get_gizmo_transform().basis.get_axis(1));
plane_mv = true;
break;
case TRANSFORM_XY:
motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(0) + spatial_editor->get_gizmo_transform().basis.get_axis(1);
plane = Plane(_edit.center, spatial_editor->get_gizmo_transform().basis.get_axis(2));
plane_mv = true;
break;
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Vector3 intersection;
if (!plane.intersects_ray(ray_pos, ray, &intersection))
break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Vector3 click;
if (!plane.intersects_ray(_edit.click_ray_pos, _edit.click_ray, &click))
break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
Vector3 motion = intersection - click;
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
if (_edit.plane != TRANSFORM_VIEW) {
if (!plane_mv) {
motion = motion_mask.dot(motion) * motion_mask;
} else {
// Alternative planar scaling mode
if (_get_key_modifier(m) != KEY_SHIFT) {
motion = motion_mask.dot(motion) * motion_mask;
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
} else {
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
float center_click_dist = click.distance_to(_edit.center);
float center_inters_dist = intersection.distance_to(_edit.center);
if (center_click_dist == 0)
break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
float scale = center_inters_dist - center_click_dist;
motion = Vector3(scale, scale, scale);
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
List<Node *> &selection = editor_selection->get_selected_node_list();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fixed View plane local rotation. Plus some cleanups.
2017-11-13 08:15:41 +00:00
bool local_coords = (spatial_editor->are_local_coords_enabled() && _edit.plane != TRANSFORM_VIEW); // Disable local transformation for TRANSFORM_VIEW
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
float snap = 0;
if (_edit.snap || spatial_editor->is_snap_enabled()) {
snap = spatial_editor->get_scale_snap() / 100;
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
Vector3 motion_snapped = motion;
motion_snapped.snap(Vector3(snap, snap, snap));
Fixed View plane local rotation. Plus some cleanups.
2017-11-13 08:15:41 +00:00
set_message(TTR("Scaling: ") + motion_snapped);
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
} else {
Fixed View plane local rotation. Plus some cleanups.
2017-11-13 08:15:41 +00:00
set_message(TTR("Scaling: ") + motion);
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->get());
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
if (!sp) {
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
continue;
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
SpatialEditorSelectedItem *se = editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
if (!se) {
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
continue;
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
ability to lock spatial nodes transform in editor
2017-10-23 19:21:15 +00:00
if (sp->has_meta("_edit_lock_")) {
continue;
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Transform original = se->original;
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
Transform original_local = se->original_local;
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Transform base = Transform(Basis(), _edit.center);
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
Transform t;
Vector3 local_scale;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
if (local_coords) {
Basis g = original.basis.orthonormalized();
Vector3 local_motion = g.inverse().xform(motion);
if (_edit.snap || spatial_editor->is_snap_enabled()) {
local_motion.snap(Vector3(snap, snap, snap));
}
local_scale = original_local.basis.get_scale() * (local_motion + Vector3(1, 1, 1));
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
// Prevent scaling to 0 it would break the gizmo
Basis check = original_local.basis;
check.scale(local_scale);
if (check.determinant() != 0) {
// Apply scale
sp->set_scale(local_scale);
}
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
} else {
if (_edit.snap || spatial_editor->is_snap_enabled()) {
motion.snap(Vector3(snap, snap, snap));
}
Transform r;
r.basis.scale(motion + Vector3(1, 1, 1));
t = base * (r * (base.inverse() * original));
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
// Apply scale
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
sp->set_global_transform(t);
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
Disable transform operation when navigation
2014-03-31 03:59:42 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
surface->update();
Disable transform operation when navigation
2014-03-31 03:59:42 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
Disable transform operation when navigation
2014-03-31 03:59:42 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case TRANSFORM_TRANSLATE: {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Vector3 motion_mask;
Plane plane;
Fix uninitialized bool. Breaks translation in release_debug target.
2017-11-13 21:54:33 +00:00
bool plane_mv = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
switch (_edit.plane) {
case TRANSFORM_VIEW:
plane = Plane(_edit.center, _get_camera_normal());
break;
case TRANSFORM_X_AXIS:
motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(0);
plane = Plane(_edit.center, motion_mask.cross(motion_mask.cross(_get_camera_normal())).normalized());
break;
case TRANSFORM_Y_AXIS:
motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(1);
plane = Plane(_edit.center, motion_mask.cross(motion_mask.cross(_get_camera_normal())).normalized());
Disable transform operation when navigation
2014-03-31 03:59:42 +00:00
break;
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case TRANSFORM_Z_AXIS:
motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(2);
plane = Plane(_edit.center, motion_mask.cross(motion_mask.cross(_get_camera_normal())).normalized());
break;
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
case TRANSFORM_YZ:
plane = Plane(_edit.center, spatial_editor->get_gizmo_transform().basis.get_axis(0));
plane_mv = true;
break;
case TRANSFORM_XZ:
plane = Plane(_edit.center, spatial_editor->get_gizmo_transform().basis.get_axis(1));
plane_mv = true;
break;
case TRANSFORM_XY:
plane = Plane(_edit.center, spatial_editor->get_gizmo_transform().basis.get_axis(2));
plane_mv = true;
break;
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Vector3 intersection;
if (!plane.intersects_ray(ray_pos, ray, &intersection))
break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Vector3 click;
if (!plane.intersects_ray(_edit.click_ray_pos, _edit.click_ray, &click))
break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Vector3 motion = intersection - click;
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
if (_edit.plane != TRANSFORM_VIEW) {
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
if (!plane_mv) {
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
motion = motion_mask.dot(motion) * motion_mask;
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Added proper local transform snapping, closes #4985
2017-08-08 10:55:21 +00:00
List<Node *> &selection = editor_selection->get_selected_node_list();
Fixed View plane local rotation. Plus some cleanups.
2017-11-13 08:15:41 +00:00
bool local_coords = (spatial_editor->are_local_coords_enabled() && _edit.plane != TRANSFORM_VIEW); // Disable local transformation for TRANSFORM_VIEW
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
float snap = 0;
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (_edit.snap || spatial_editor->is_snap_enabled()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
snap = spatial_editor->get_translate_snap();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
Vector3 motion_snapped = motion;
motion_snapped.snap(Vector3(snap, snap, snap));
set_message(TTR("Translating: ") + motion_snapped);
} else {
set_message(TTR("Translating: ") + motion);
Added proper local transform snapping, closes #4985
2017-08-08 10:55:21 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->get());
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (!sp) {
continue;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Disable transform operation when navigation
2014-03-31 03:59:42 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
SpatialEditorSelectedItem *se = editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
if (!se) {
continue;
}
Disable transform operation when navigation
2014-03-31 03:59:42 +00:00
ability to lock spatial nodes transform in editor
2017-10-23 19:21:15 +00:00
if (sp->has_meta("_edit_lock_")) {
continue;
}
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
Transform original = se->original;
Transform t;
if (local_coords) {
if (_edit.snap || spatial_editor->is_snap_enabled()) {
Basis g = original.basis.orthonormalized();
Vector3 local_motion = g.inverse().xform(motion);
local_motion.snap(Vector3(snap, snap, snap));
motion = g.xform(local_motion);
}
} else {
if (_edit.snap || spatial_editor->is_snap_enabled()) {
motion.snap(Vector3(snap, snap, snap));
}
}
// Apply translation
t = original;
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
t.origin += motion;
sp->set_global_transform(t);
}
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
surface->update();
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
Disable transform operation when navigation
2014-03-31 03:59:42 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case TRANSFORM_ROTATE: {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Plane plane;
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
Vector3 axis;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
switch (_edit.plane) {
case TRANSFORM_VIEW:
plane = Plane(_edit.center, _get_camera_normal());
break;
case TRANSFORM_X_AXIS:
plane = Plane(_edit.center, spatial_editor->get_gizmo_transform().basis.get_axis(0));
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
axis = Vector3(1, 0, 0);
Disable transform operation when navigation
2014-03-31 03:59:42 +00:00
break;
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case TRANSFORM_Y_AXIS:
plane = Plane(_edit.center, spatial_editor->get_gizmo_transform().basis.get_axis(1));
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
axis = Vector3(0, 1, 0);
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
break;
case TRANSFORM_Z_AXIS:
plane = Plane(_edit.center, spatial_editor->get_gizmo_transform().basis.get_axis(2));
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
axis = Vector3(0, 0, 1);
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
break;
}
Vector3 intersection;
if (!plane.intersects_ray(ray_pos, ray, &intersection))
break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Vector3 click;
if (!plane.intersects_ray(_edit.click_ray_pos, _edit.click_ray, &click))
break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Vector3 y_axis = (click - _edit.center).normalized();
Vector3 x_axis = plane.normal.cross(y_axis).normalized();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
float angle = Math::atan2(x_axis.dot(intersection - _edit.center), y_axis.dot(intersection - _edit.center));
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (_edit.snap || spatial_editor->is_snap_enabled()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
float snap = spatial_editor->get_rotate_snap();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (snap) {
angle = Math::rad2deg(angle) + snap * 0.5; //else it wont reach +180
angle -= Math::fmod(angle, snap);
set_message(vformat(TTR("Rotating %s degrees."), rtos(angle)));
angle = Math::deg2rad(angle);
} else
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
set_message(vformat(TTR("Rotating %s degrees."), rtos(Math::rad2deg(angle))));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} else {
set_message(vformat(TTR("Rotating %s degrees."), rtos(Math::rad2deg(angle))));
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
List<Node *> &selection = editor_selection->get_selected_node_list();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fixed View plane local rotation. Plus some cleanups.
2017-11-13 08:15:41 +00:00
bool local_coords = (spatial_editor->are_local_coords_enabled() && _edit.plane != TRANSFORM_VIEW); // Disable local transformation for TRANSFORM_VIEW
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->get());
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (!sp)
continue;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
SpatialEditorSelectedItem *se = editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
if (!se)
continue;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
ability to lock spatial nodes transform in editor
2017-10-23 19:21:15 +00:00
if (sp->has_meta("_edit_lock_")) {
continue;
}
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
Transform t;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
if (local_coords) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
Transform original_local = se->original_local;
Basis rot = Basis(axis, angle);
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
t.basis = original_local.get_basis().orthonormalized() * rot;
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
t.origin = original_local.origin;
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
// Apply rotation
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
sp->set_transform(t);
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
sp->set_scale(original_local.basis.get_scale()); // re-apply original scale
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
} else {
Transform original = se->original;
Transform r;
Transform base = Transform(Basis(), _edit.center);
r.basis.rotate(plane.normal, angle);
t = base * r * base.inverse() * original;
Cleanups in Spatial Transform Gizmo Fixed translation i local space - changed a bit how it was implemented. Fixed bug with rotations when object is scaled. Added safety check preventing scaling to 0 in local space. All Gizmoz display numerical output message on the bottom of the viewport. Unified code a bit, so it will be easier to maintain.
2017-11-08 15:07:30 +00:00
// Apply rotation
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
sp->set_global_transform(t);
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
surface->update();
Fixed rotating in local space using 3D Gizmo.
2017-10-04 07:34:58 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
default: {}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Add option to use freelook with a toggle shortcut (like Blender) instead of holding RMB (like Unity)
2017-10-30 00:22:48 +00:00
} else if ((m->get_button_mask() & BUTTON_MASK_RIGHT) || freelook_active) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (nav_scheme == NAVIGATION_MAYA && m->get_alt()) {
nav_mode = NAVIGATION_ZOOM;
Added configurable modifier key to activate freelook
2017-07-23 00:02:18 +00:00
} else if (freelook_active) {
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
nav_mode = NAVIGATION_LOOK;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} else if (m->get_button_mask() & BUTTON_MASK_MIDDLE) {
if (nav_scheme == NAVIGATION_GODOT) {
Made trackpad behaviour optional in 3D mode (issue #4265)
2016-04-12 01:37:35 +00:00
Added configurable modifier key to activate freelook
2017-07-23 00:02:18 +00:00
int mod = _get_key_modifier(m);
remove trailing whitespace
2016-05-21 13:29:25 +00:00
settings 'editors/3d' organized, sorted, new_defaults
2017-09-19 00:30:48 +00:00
if (mod == _get_key_modifier_setting("editors/3d/navigation/pan_modifier"))
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
nav_mode = NAVIGATION_PAN;
settings 'editors/3d' organized, sorted, new_defaults
2017-09-19 00:30:48 +00:00
else if (mod == _get_key_modifier_setting("editors/3d/navigation/zoom_modifier"))
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
nav_mode = NAVIGATION_ZOOM;
settings 'editors/3d' organized, sorted, new_defaults
2017-09-19 00:30:48 +00:00
else if (mod == _get_key_modifier_setting("editors/3d/navigation/orbit_modifier"))
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
nav_mode = NAVIGATION_ORBIT;
} else if (nav_scheme == NAVIGATION_MAYA) {
if (m->get_alt())
nav_mode = NAVIGATION_PAN;
Add maya style navigation scheme to 3d vieewport
2014-03-31 03:07:21 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
settings 'editors/3d' organized, sorted, new_defaults
2017-09-19 00:30:48 +00:00
} else if (EditorSettings::get_singleton()->get("editors/3d/navigation/emulate_3_button_mouse")) {
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
// Handle trackpad (no external mouse) use case
Added configurable modifier key to activate freelook
2017-07-23 00:02:18 +00:00
int mod = _get_key_modifier(m);
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (mod) {
settings 'editors/3d' organized, sorted, new_defaults
2017-09-19 00:30:48 +00:00
if (mod == _get_key_modifier_setting("editors/3d/navigation/pan_modifier"))
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
nav_mode = NAVIGATION_PAN;
settings 'editors/3d' organized, sorted, new_defaults
2017-09-19 00:30:48 +00:00
else if (mod == _get_key_modifier_setting("editors/3d/navigation/zoom_modifier"))
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
nav_mode = NAVIGATION_ZOOM;
settings 'editors/3d' organized, sorted, new_defaults
2017-09-19 00:30:48 +00:00
else if (mod == _get_key_modifier_setting("editors/3d/navigation/orbit_modifier"))
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
nav_mode = NAVIGATION_ORBIT;
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
switch (nav_mode) {
case NAVIGATION_PAN: {
Native pan and zoom for macOS
2017-11-01 20:49:39 +00:00
_nav_pan(m, _get_warped_mouse_motion(m));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Native pan and zoom for macOS
2017-11-01 20:49:39 +00:00
} break;
case NAVIGATION_ZOOM: {
_nav_zoom(m, m->get_relative());
} break;
case NAVIGATION_ORBIT: {
_nav_orbit(m, _get_warped_mouse_motion(m));
} break;
case NAVIGATION_LOOK: {
_nav_look(m, _get_warped_mouse_motion(m));
} break;
default: {}
}
}
Implement warped mouse panning for 2D & 3D editors Enabled by default as in Blender, but can be disabled separately for 2D & 3D; the core functionality is in Input so this could be reused or even exposed to scripts in the future
2017-03-22 20:18:47 +00:00
Native pan and zoom for macOS
2017-11-01 20:49:39 +00:00
Ref<InputEventMagnifyGesture> magnify_gesture = p_event;
if (magnify_gesture.is_valid()) {
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Native pan and zoom for macOS
2017-11-01 20:49:39 +00:00
if (is_freelook_active())
scale_freelook_speed(magnify_gesture->get_factor());
else
scale_cursor_distance(1.0 / magnify_gesture->get_factor());
}
Ref<InputEventPanGesture> pan_gesture = p_event;
if (pan_gesture.is_valid()) {
NavigationScheme nav_scheme = (NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int();
NavigationMode nav_mode = NAVIGATION_NONE;
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Native pan and zoom for macOS
2017-11-01 20:49:39 +00:00
if (nav_scheme == NAVIGATION_GODOT) {
int mod = _get_key_modifier(pan_gesture);
if (mod == _get_key_modifier_setting("editors/3d/navigation/pan_modifier"))
nav_mode = NAVIGATION_PAN;
else if (mod == _get_key_modifier_setting("editors/3d/navigation/zoom_modifier"))
nav_mode = NAVIGATION_ZOOM;
else if (mod == _get_key_modifier_setting("editors/3d/navigation/orbit_modifier"))
nav_mode = NAVIGATION_ORBIT;
} else if (nav_scheme == NAVIGATION_MAYA) {
if (pan_gesture->get_alt())
nav_mode = NAVIGATION_PAN;
}
switch (nav_mode) {
case NAVIGATION_PAN: {
_nav_pan(m, pan_gesture->get_delta());
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
case NAVIGATION_ZOOM: {
Native pan and zoom for macOS
2017-11-01 20:49:39 +00:00
_nav_zoom(m, pan_gesture->get_delta());
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case NAVIGATION_ORBIT: {
Native pan and zoom for macOS
2017-11-01 20:49:39 +00:00
_nav_orbit(m, pan_gesture->get_delta());
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case NAVIGATION_LOOK: {
Native pan and zoom for macOS
2017-11-01 20:49:39 +00:00
_nav_look(m, pan_gesture->get_delta());
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
default: {}
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Ref<InputEventKey> k = p_event;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (k.is_valid()) {
if (!k->is_pressed())
return;
if (ED_IS_SHORTCUT("spatial_editor/snap", p_event)) {
if (_edit.mode != TRANSFORM_NONE) {
_edit.snap = true;
}
}
if (ED_IS_SHORTCUT("spatial_editor/bottom_view", p_event)) {
cursor.y_rot = 0;
cursor.x_rot = -Math_PI / 2.0;
set_message(TTR("Bottom View."), 2);
name = TTR("Bottom");
_update_name();
}
if (ED_IS_SHORTCUT("spatial_editor/top_view", p_event)) {
cursor.y_rot = 0;
cursor.x_rot = Math_PI / 2.0;
set_message(TTR("Top View."), 2);
name = TTR("Top");
_update_name();
}
if (ED_IS_SHORTCUT("spatial_editor/rear_view", p_event)) {
cursor.x_rot = 0;
cursor.y_rot = Math_PI;
set_message(TTR("Rear View."), 2);
name = TTR("Rear");
_update_name();
}
if (ED_IS_SHORTCUT("spatial_editor/front_view", p_event)) {
cursor.x_rot = 0;
cursor.y_rot = 0;
set_message(TTR("Front View."), 2);
name = TTR("Front");
_update_name();
}
if (ED_IS_SHORTCUT("spatial_editor/left_view", p_event)) {
cursor.x_rot = 0;
cursor.y_rot = Math_PI / 2.0;
set_message(TTR("Left View."), 2);
name = TTR("Left");
_update_name();
}
if (ED_IS_SHORTCUT("spatial_editor/right_view", p_event)) {
cursor.x_rot = 0;
cursor.y_rot = -Math_PI / 2.0;
set_message(TTR("Right View."), 2);
name = TTR("Right");
_update_name();
}
if (ED_IS_SHORTCUT("spatial_editor/switch_perspective_orthogonal", p_event)) {
_menu_option(orthogonal ? VIEW_PERSPECTIVE : VIEW_ORTHOGONAL);
_update_name();
}
if (ED_IS_SHORTCUT("spatial_editor/insert_anim_key", p_event)) {
if (!get_selected_count() || _edit.mode != TRANSFORM_NONE)
return;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (!AnimationPlayerEditor::singleton->get_key_editor()->has_keying()) {
set_message(TTR("Keying is disabled (no key inserted)."));
return;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
List<Node *> &selection = editor_selection->get_selected_node_list();
Add align with view in 3d editor viewport (useful for aligning camera with current view)
2014-03-31 15:06:36 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
Add align with view in 3d editor viewport (useful for aligning camera with current view)
2014-03-31 15:06:36 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->get());
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (!sp)
continue;
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
emit_signal("transform_key_request", sp, "", sp->get_transform());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
set_message(TTR("Animation Key Inserted."));
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Add option to use freelook with a toggle shortcut (like Blender) instead of holding RMB (like Unity)
2017-10-30 00:22:48 +00:00
if (ED_IS_SHORTCUT("spatial_editor/freelook_toggle", p_event)) {
set_freelook_active(!is_freelook_active());
} else if (k->get_scancode() == KEY_ESCAPE) {
set_freelook_active(false);
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (k->get_scancode() == KEY_SPACE) {
if (!k->is_pressed()) emit_signal("toggle_maximize_view", this);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Several improvements to GridMap. Fixed crash when undoing. More ergonomic shortcuts. Fixed freelook navigation.
2017-10-29 20:31:38 +00:00
// freelook uses most of the useful shortcuts, like save, so its ok
// to consider freelook active as end of the line for future events.
if (freelook_active)
accept_event();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Native pan and zoom for macOS
2017-11-01 20:49:39 +00:00
void SpatialEditorViewport::_nav_pan(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) {
const NavigationScheme nav_scheme = (NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int();
real_t pan_speed = 1 / 150.0;
int pan_speed_modifier = 10;
if (nav_scheme == NAVIGATION_MAYA && p_event->get_shift())
pan_speed *= pan_speed_modifier;
Transform camera_transform;
camera_transform.translate(cursor.pos);
camera_transform.basis.rotate(Vector3(1, 0, 0), -cursor.x_rot);
camera_transform.basis.rotate(Vector3(0, 1, 0), -cursor.y_rot);
Vector3 translation(-p_relative.x * pan_speed, p_relative.y * pan_speed, 0);
translation *= cursor.distance / DISTANCE_DEFAULT;
camera_transform.translate(translation);
cursor.pos = camera_transform.origin;
}
void SpatialEditorViewport::_nav_zoom(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) {
const NavigationScheme nav_scheme = (NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int();
real_t zoom_speed = 1 / 80.0;
int zoom_speed_modifier = 10;
if (nav_scheme == NAVIGATION_MAYA && p_event->get_shift())
zoom_speed *= zoom_speed_modifier;
NavigationZoomStyle zoom_style = (NavigationZoomStyle)EditorSettings::get_singleton()->get("editors/3d/navigation/zoom_style").operator int();
if (zoom_style == NAVIGATION_ZOOM_HORIZONTAL) {
if (p_relative.x > 0)
scale_cursor_distance(1 - p_relative.x * zoom_speed);
else if (p_relative.x < 0)
scale_cursor_distance(1.0 / (1 + p_relative.x * zoom_speed));
} else {
if (p_relative.y > 0)
scale_cursor_distance(1 + p_relative.y * zoom_speed);
else if (p_relative.y < 0)
scale_cursor_distance(1.0 / (1 - p_relative.y * zoom_speed));
}
}
void SpatialEditorViewport::_nav_orbit(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) {
real_t degrees_per_pixel = EditorSettings::get_singleton()->get("editors/3d/navigation_feel/orbit_sensitivity");
real_t radians_per_pixel = Math::deg2rad(degrees_per_pixel);
cursor.x_rot += p_relative.y * radians_per_pixel;
cursor.y_rot += p_relative.x * radians_per_pixel;
if (cursor.x_rot > Math_PI / 2.0)
cursor.x_rot = Math_PI / 2.0;
if (cursor.x_rot < -Math_PI / 2.0)
cursor.x_rot = -Math_PI / 2.0;
name = "";
_update_name();
}
void SpatialEditorViewport::_nav_look(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) {
// Freelook only works properly in perspective.
// It technically works too in ortho, but it's awful for a user due to fov being near zero
if (!orthogonal) {
real_t degrees_per_pixel = EditorSettings::get_singleton()->get("editors/3d/navigation_feel/orbit_sensitivity");
real_t radians_per_pixel = Math::deg2rad(degrees_per_pixel);
// Note: do NOT assume the camera has the "current" transform, because it is interpolated and may have "lag".
Transform prev_camera_transform = to_camera_transform(cursor);
cursor.x_rot += p_relative.y * radians_per_pixel;
cursor.y_rot += p_relative.x * radians_per_pixel;
if (cursor.x_rot > Math_PI / 2.0)
cursor.x_rot = Math_PI / 2.0;
if (cursor.x_rot < -Math_PI / 2.0)
cursor.x_rot = -Math_PI / 2.0;
// Look is like the opposite of Orbit: the focus point rotates around the camera
Transform camera_transform = to_camera_transform(cursor);
Vector3 pos = camera_transform.xform(Vector3(0, 0, 0));
Vector3 prev_pos = prev_camera_transform.xform(Vector3(0, 0, 0));
Vector3 diff = prev_pos - pos;
cursor.pos += diff;
name = "";
_update_name();
}
}
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
void SpatialEditorViewport::set_freelook_active(bool active_now) {
if (!freelook_active && active_now) {
// Sync camera cursor to cursor to "cut" interpolation jumps due to changing referential
cursor = camera_cursor;
// Make sure eye_pos is synced, because freelook referential is eye pos rather than orbit pos
Vector3 forward = to_camera_transform(cursor).basis.xform(Vector3(0, 0, -1));
cursor.eye_pos = cursor.pos - cursor.distance * forward;
// Also sync the camera cursor, otherwise switching to freelook will be trippy if inertia is active
camera_cursor.eye_pos = cursor.eye_pos;
if (EditorSettings::get_singleton()->get("editors/3d/freelook/freelook_speed_zoom_link")) {
// Re-adjust freelook speed from the current zoom level
real_t base_speed = EditorSettings::get_singleton()->get("editors/3d/freelook/freelook_base_speed");
freelook_speed = base_speed * cursor.distance;
}
Add option to use freelook with a toggle shortcut (like Blender) instead of holding RMB (like Unity)
2017-10-30 00:22:48 +00:00
// Hide mouse like in an FPS (warping doesn't work)
OS::get_singleton()->set_mouse_mode(OS::MOUSE_MODE_CAPTURED);
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
} else if (freelook_active && !active_now) {
// Sync camera cursor to cursor to "cut" interpolation jumps due to changing referential
cursor = camera_cursor;
Add option to use freelook with a toggle shortcut (like Blender) instead of holding RMB (like Unity)
2017-10-30 00:22:48 +00:00
// Restore mouse
OS::get_singleton()->set_mouse_mode(OS::MOUSE_MODE_VISIBLE);
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
}
freelook_active = active_now;
}
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
void SpatialEditorViewport::scale_cursor_distance(real_t scale) {
// Prevents zero distance which would short-circuit any scaling
if (cursor.distance < ZOOM_MIN_DISTANCE)
cursor.distance = ZOOM_MIN_DISTANCE;
cursor.distance *= scale;
if (cursor.distance < ZOOM_MIN_DISTANCE)
cursor.distance = ZOOM_MIN_DISTANCE;
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
zoom_indicator_delay = ZOOM_INDICATOR_DELAY_S;
surface->update();
}
void SpatialEditorViewport::scale_freelook_speed(real_t scale) {
// Prevents zero distance which would short-circuit any scaling
if (freelook_speed < FREELOOK_MIN_SPEED)
freelook_speed = FREELOOK_MIN_SPEED;
freelook_speed *= scale;
if (freelook_speed < FREELOOK_MIN_SPEED)
freelook_speed = FREELOOK_MIN_SPEED;
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
zoom_indicator_delay = ZOOM_INDICATOR_DELAY_S;
surface->update();
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Point2i SpatialEditorViewport::_get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_ev_mouse_motion) const {
Spatial Editor: Mouse warping for orbit & freelook modes.
2017-05-05 21:42:48 +00:00
Point2i relative;
settings 'editors/3d' organized, sorted, new_defaults
2017-09-19 00:30:48 +00:00
if (bool(EDITOR_DEF("editors/3d/navigation/warped_mouse_panning", false))) {
Spatial Editor: Mouse warping for orbit & freelook modes.
2017-05-05 21:42:48 +00:00
relative = Input::get_singleton()->warp_mouse_motion(p_ev_mouse_motion, surface->get_global_rect());
} else {
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
relative = p_ev_mouse_motion->get_relative();
Spatial Editor: Mouse warping for orbit & freelook modes.
2017-05-05 21:42:48 +00:00
}
return relative;
}
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
void SpatialEditorViewport::_update_freelook(real_t delta) {
Added freelook inertia
2017-08-26 19:55:09 +00:00
if (!is_freelook_active()) {
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
return;
Added freelook inertia
2017-08-26 19:55:09 +00:00
}
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
Vector3 forward = camera->get_transform().basis.xform(Vector3(0, 0, -1));
Vector3 right = camera->get_transform().basis.xform(Vector3(1, 0, 0));
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Vector3 up = camera->get_transform().basis.xform(Vector3(0, 1, 0));
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
int key_left = Object::cast_to<InputEventKey>(ED_GET_SHORTCUT("spatial_editor/freelook_left")->get_shortcut().ptr())->get_scancode();
int key_right = Object::cast_to<InputEventKey>(ED_GET_SHORTCUT("spatial_editor/freelook_right")->get_shortcut().ptr())->get_scancode();
int key_forward = Object::cast_to<InputEventKey>(ED_GET_SHORTCUT("spatial_editor/freelook_forward")->get_shortcut().ptr())->get_scancode();
int key_backwards = Object::cast_to<InputEventKey>(ED_GET_SHORTCUT("spatial_editor/freelook_backwards")->get_shortcut().ptr())->get_scancode();
int key_up = Object::cast_to<InputEventKey>(ED_GET_SHORTCUT("spatial_editor/freelook_up")->get_shortcut().ptr())->get_scancode();
int key_down = Object::cast_to<InputEventKey>(ED_GET_SHORTCUT("spatial_editor/freelook_down")->get_shortcut().ptr())->get_scancode();
int key_speed_modifier = Object::cast_to<InputEventKey>(ED_GET_SHORTCUT("spatial_editor/freelook_speed_modifier")->get_shortcut().ptr())->get_scancode();
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
Added freelook inertia
2017-08-26 19:55:09 +00:00
Vector3 direction;
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
bool speed_modifier = false;
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
const Input &input = *Input::get_singleton();
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
if (input.is_key_pressed(key_left)) {
Added freelook inertia
2017-08-26 19:55:09 +00:00
direction -= right;
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
}
if (input.is_key_pressed(key_right)) {
Added freelook inertia
2017-08-26 19:55:09 +00:00
direction += right;
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
}
if (input.is_key_pressed(key_forward)) {
Added freelook inertia
2017-08-26 19:55:09 +00:00
direction += forward;
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
}
if (input.is_key_pressed(key_backwards)) {
Added freelook inertia
2017-08-26 19:55:09 +00:00
direction -= forward;
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
}
if (input.is_key_pressed(key_up)) {
Added freelook inertia
2017-08-26 19:55:09 +00:00
direction += up;
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
}
if (input.is_key_pressed(key_down)) {
Added freelook inertia
2017-08-26 19:55:09 +00:00
direction -= up;
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
}
if (input.is_key_pressed(key_speed_modifier)) {
speed_modifier = true;
}
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
real_t speed = freelook_speed;
if (speed_modifier) {
real_t modifier_speed_factor = EditorSettings::get_singleton()->get("editors/3d/freelook/freelook_modifier_speed_factor");
Added freelook inertia
2017-08-26 19:55:09 +00:00
speed *= modifier_speed_factor;
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
}
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
Vector3 motion = direction * speed * delta;
cursor.pos += motion;
cursor.eye_pos += motion;
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditorViewport::set_message(String p_message, float p_time) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
message = p_message;
message_time = p_time;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void SpatialEditorViewport::_notification(int p_what) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
bool visible = is_visible_in_tree();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
set_process(visible);
Fixes errors occurring when switching to a new scene with a spatial editor from a canvas editor.
2016-04-06 06:34:34 +00:00
if (visible)
-Massive clean up to gizmos -Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
2017-08-26 03:40:45 +00:00
_update_camera(0);
remove trailing whitespace
2016-05-21 13:29:25 +00:00
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
call_deferred("update_transform_gizmo_view");
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_what == NOTIFICATION_RESIZED) {
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
call_deferred("update_transform_gizmo_view");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_what == NOTIFICATION_PROCESS) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//force editr camera
/*
current_camera=get_root_node()->get_current_camera();
if (current_camera!=camera) {
}
*/
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
real_t delta = get_process_delta_time();
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
if (zoom_indicator_delay > 0) {
zoom_indicator_delay -= delta;
if (zoom_indicator_delay <= 0) {
surface->update();
}
}
_update_freelook(delta);
Added 3D freelook navigation mode - Triggered by holding RMB - Can look around in FPS style - Can move with WASD - Movement speed accelerates over time - Can multiply speed with a modifier key to go faster or slower - Configurable in editor settings and shortcuts
2017-05-01 18:57:35 +00:00
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
_update_camera(delta);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Map<Node *, Object *> &selection = editor_selection->get_selection();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
bool changed = false;
bool exist = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (Map<Node *, Object *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->key());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!sp)
continue;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
SpatialEditorSelectedItem *se = editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!se)
continue;
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
VisualInstance *vi = Object::cast_to<VisualInstance>(sp);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (se->aabb.has_no_surface()) {
Rename Rect3 to AABB. Fixes #12973.
2017-11-17 02:09:00 +00:00
se->aabb = vi ? vi->get_aabb() : AABB(Vector3(-0.2, -0.2, -0.2), Vector3(0.4, 0.4, 0.4));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Transform t = sp->get_global_transform();
renamed all Rect3.pos to Rect3.position
2017-06-06 18:33:51 +00:00
t.translate(se->aabb.position);
Fix the order of transformations for selection bounding box in spatial editor. This was broken in #7438 where the ordering of scaling in Basis::scale() was fixed, but this line of code (which relied on the incorrect behavior) wasn't updated correctly. Fixes #9894.
2017-08-23 00:05:41 +00:00
// apply AABB scaling before item's global transform
Basis aabb_s;
aabb_s.scale(se->aabb.size);
t.basis = t.basis * aabb_s;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
exist = true;
if (se->last_xform == t)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
changed = true;
se->last_xform = t;
VisualServer::get_singleton()->instance_set_transform(se->sbox_instance, t);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
if (changed || (spatial_editor->is_gizmo_visible() && !exist)) {
spatial_editor->update_transform_gizmo();
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (message_time > 0) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (message != last_message) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
surface->update();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
last_message = message;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Renamed fixed_process to physics_process
2017-09-30 14:19:07 +00:00
message_time -= get_physics_process_delta_time();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (message_time < 0)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
surface->update();
}
WIP particle system Ability to enable and change MSAA settings Ability to change VCT quality Ability to enable/disable HDR rendering
2017-01-02 01:16:52 +00:00
//update shadow atlas if changed
all light types and shadows are working, pending a lot of clean-up
2016-11-10 02:55:06 +00:00
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 20:00:46 +00:00
int shadowmap_size = ProjectSettings::get_singleton()->get("rendering/quality/shadow_atlas/size");
int atlas_q0 = ProjectSettings::get_singleton()->get("rendering/quality/shadow_atlas/quadrant_0_subdiv");
int atlas_q1 = ProjectSettings::get_singleton()->get("rendering/quality/shadow_atlas/quadrant_1_subdiv");
int atlas_q2 = ProjectSettings::get_singleton()->get("rendering/quality/shadow_atlas/quadrant_2_subdiv");
int atlas_q3 = ProjectSettings::get_singleton()->get("rendering/quality/shadow_atlas/quadrant_3_subdiv");
all light types and shadows are working, pending a lot of clean-up
2016-11-10 02:55:06 +00:00
viewport->set_shadow_atlas_size(shadowmap_size);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
viewport->set_shadow_atlas_quadrant_subdiv(0, Viewport::ShadowAtlasQuadrantSubdiv(atlas_q0));
viewport->set_shadow_atlas_quadrant_subdiv(1, Viewport::ShadowAtlasQuadrantSubdiv(atlas_q1));
viewport->set_shadow_atlas_quadrant_subdiv(2, Viewport::ShadowAtlasQuadrantSubdiv(atlas_q2));
viewport->set_shadow_atlas_quadrant_subdiv(3, Viewport::ShadowAtlasQuadrantSubdiv(atlas_q3));
all light types and shadows are working, pending a lot of clean-up
2016-11-10 02:55:06 +00:00
Ability to shrink 3D viewport by half
2017-10-31 17:23:25 +00:00
bool shrink = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_HALF_RESOLUTION));
if (shrink != viewport_container->get_stretch_shrink() > 1) {
viewport_container->set_stretch_shrink(shrink ? 2 : 1);
}
WIP particle system Ability to enable and change MSAA settings Ability to change VCT quality Ability to enable/disable HDR rendering
2017-01-02 01:16:52 +00:00
//update msaa if changed
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 20:00:46 +00:00
int msaa_mode = ProjectSettings::get_singleton()->get("rendering/quality/filters/msaa");
WIP particle system Ability to enable and change MSAA settings Ability to change VCT quality Ability to enable/disable HDR rendering
2017-01-02 01:16:52 +00:00
viewport->set_msaa(Viewport::MSAA(msaa_mode));
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 20:00:46 +00:00
bool hdr = ProjectSettings::get_singleton()->get("rendering/quality/depth/hdr");
WIP particle system Ability to enable and change MSAA settings Ability to change VCT quality Ability to enable/disable HDR rendering
2017-01-02 01:16:52 +00:00
viewport->set_hdr(hdr);
Restored everything related to information polling, and added information box for viewport.
2017-06-11 21:13:04 +00:00
bool show_info = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_INFORMATION));
if (show_info != info->is_visible()) {
if (show_info)
info->show();
else
info->hide();
}
if (show_info) {
String text;
text += TTR("Objects Drawn") + ": " + itos(viewport->get_render_info(Viewport::RENDER_INFO_OBJECTS_IN_FRAME)) + "\n";
text += TTR("Material Changes") + ": " + itos(viewport->get_render_info(Viewport::RENDER_INFO_MATERIAL_CHANGES_IN_FRAME)) + "\n";
text += TTR("Shader Changes") + ": " + itos(viewport->get_render_info(Viewport::RENDER_INFO_SHADER_CHANGES_IN_FRAME)) + "\n";
text += TTR("Surface Changes") + ": " + itos(viewport->get_render_info(Viewport::RENDER_INFO_SURFACE_CHANGES_IN_FRAME)) + "\n";
text += TTR("Draw Calls") + ": " + itos(viewport->get_render_info(Viewport::RENDER_INFO_DRAW_CALLS_IN_FRAME)) + "\n";
text += TTR("Vertices") + ": " + itos(viewport->get_render_info(Viewport::RENDER_INFO_VERTICES_IN_FRAME));
if (info_label->get_text() != text || surface->get_size() != prev_size) {
info_label->set_text(text);
Size2 ms = info->get_minimum_size();
info->set_position(surface->get_size() - ms - Vector2(20, 20) * EDSCALE);
}
}
Add "View FPS" in 3D->Perspective's popup. "Fixes" to make it acceptable by clang-format. "Fixes" to make it acceptable by clang-format.
2017-11-19 20:00:16 +00:00
// FPS Counter.
bool show_fps = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_FPS));
if (show_fps != fps->is_visible()) {
if (show_fps)
fps->show();
else
fps->hide();
}
if (show_fps) {
String text;
const float temp_fps = Engine::get_singleton()->get_frames_per_second();
text += TTR("FPS") + ": " + itos(temp_fps) + " (" + String::num(1000.0f / temp_fps, 2) + " ms)";
if (fps_label->get_text() != text || surface->get_size() != prev_size) {
fps_label->set_text(text);
Size2 ms = fps->get_size();
Size2 size = surface->get_size();
size.y = ms.y + 20;
fps->set_position(size - ms - Vector2(20, 0) * EDSCALE);
}
}
Restored everything related to information polling, and added information box for viewport.
2017-06-11 21:13:04 +00:00
prev_size = surface->get_size();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_what == NOTIFICATION_ENTER_TREE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
surface->connect("draw", this, "_draw");
surface->connect("gui_input", this, "_sinput");
surface->connect("mouse_entered", this, "_smouseenter");
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
surface->connect("mouse_exited", this, "_smouseexit");
Restored everything related to information polling, and added information box for viewport.
2017-06-11 21:13:04 +00:00
info->add_style_override("panel", get_stylebox("panel", "Panel"));
Add "View FPS" in 3D->Perspective's popup. "Fixes" to make it acceptable by clang-format. "Fixes" to make it acceptable by clang-format.
2017-11-19 20:00:16 +00:00
fps->add_style_override("panel", get_stylebox("panel", "Panel"));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
preview_camera->set_icon(get_icon("Camera", "EditorIcons"));
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
_init_gizmo_instance(index);
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-20 22:38:02 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_what == NOTIFICATION_EXIT_TREE) {
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-20 22:38:02 +00:00
_finish_gizmo_instances();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_what == NOTIFICATION_MOUSE_ENTER) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_what == NOTIFICATION_DRAW) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
// TODO That should be part of the drawing API...
Added icon under zoom/speed indicator bar
2017-10-15 19:20:51 +00:00
static void stroke_rect(CanvasItem &ci, Rect2 rect, Color color, real_t width = 1.0) {
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
// a---b
// | |
// c---d
renamed all Rect2.pos to Rect2.position
2017-06-03 22:25:13 +00:00
Vector2 a(rect.position);
Vector2 b(rect.position.x + rect.size.x, rect.position.y);
Vector2 c(rect.position.x, rect.position.y + rect.size.y);
Vector2 d(rect.position + rect.size);
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Added icon under zoom/speed indicator bar
2017-10-15 19:20:51 +00:00
ci.draw_line(a, b, color, width);
ci.draw_line(b, d, color, width);
ci.draw_line(d, c, color, width);
ci.draw_line(c, a, color, width);
}
static void draw_indicator_bar(Control &surface, real_t fill, Ref<Texture> icon) {
// Adjust bar size from control height
Vector2 surface_size = surface.get_size();
real_t h = surface_size.y / 2.0;
real_t y = (surface_size.y - h) / 2.0;
Rect2 r(10, y, 6, h);
real_t sy = r.size.y * fill;
// Note: because this bar appears over the viewport, it has to stay readable for any background color
// Draw both neutral dark and bright colors to account this
surface.draw_rect(r, Color(1, 1, 1, 0.2));
surface.draw_rect(Rect2(r.position.x, r.position.y + r.size.y - sy, r.size.x, sy), Color(1, 1, 1, 0.6));
stroke_rect(surface, r.grow(1), Color(0, 0, 0, 0.7));
Vector2 icon_size = icon->get_size();
Vector2 icon_pos = Vector2(r.position.x - (icon_size.x - r.size.x) / 2, r.position.y + r.size.y + 2);
surface.draw_texture(icon, icon_pos);
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void SpatialEditorViewport::_draw() {
Universalize draw-over API for EditorPlugins - Now it is usable from both `CanvasItem` and `Spatial` editors. - `EditorPlugin` API changes: - `forward_draw_over_canvas()` becomes `forward_draw_over_viewport()`. - `update_canvas()` becomes `update_overlays()`, which now triggers the update of every overlay on top of any 2D or 3D viewports present. Also now it returns the number of such viewports, which is useful whenever you need to know the number of draw-over calls you'll get. - New: `[set/is]_force_draw_over_forwarding_enabled()` to force overlaying regardless it handles the current object type, in a similar fashion as `[set/is]_input_event_forwarding_always_enabled`. This kind of overlay is also on top of those for regular handled node types. - New: `forward_force_draw_over_canvas()`, which is the callback that gets called for plugins that enable forced overlaying.
2017-10-29 19:32:09 +00:00
EditorPluginList *over_plugin_list = EditorNode::get_singleton()->get_editor_plugins_over();
if (!over_plugin_list->empty()) {
over_plugin_list->forward_draw_over_viewport(surface);
}
EditorPluginList *force_over_plugin_list = editor->get_editor_plugins_force_over();
if (!force_over_plugin_list->empty()) {
force_over_plugin_list->forward_force_draw_over_viewport(surface);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (surface->has_focus()) {
Size2 size = surface->get_size();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Rect2 r = Rect2(Point2(), size);
New customizable editor theme
2017-05-02 20:13:12 +00:00
get_stylebox("Focus", "EditorStyles")->draw(surface->get_canvas_item(), r);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
RID ci = surface->get_canvas_item();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (cursor.region_select) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(cursor.region_begin, cursor.region_end - cursor.region_begin), Color(0.7, 0.7, 1.0, 0.3));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (message_time > 0) {
Ref<Font> font = get_font("font", "Label");
Point2 msgpos = Point2(5, get_size().y - 20);
font->draw(ci, msgpos + Point2(1, 1), message, Color(0, 0, 0, 0.8));
font->draw(ci, msgpos + Point2(-1, -1), message, Color(0, 0, 0, 0.8));
font->draw(ci, msgpos, message, Color(1, 1, 1, 1));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (_edit.mode == TRANSFORM_ROTATE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Point2 center = _point_to_screen(_edit.center);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
VisualServer::get_singleton()->canvas_item_add_line(ci, _edit.mouse_pos, center, Color(0.4, 0.7, 1.0, 0.8));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Camera Fixes -=-=-=-=-=-= -Object Picking and orthogonal camera related functions fixed (i hope) -Going to preview mode in the camera shows a frame with the correct game aspect ratio -Changed Camera API and properties a little t make it more straightforward -Fixed bug in shader compiler. -Fixed bug in ShaderGL
2014-09-15 23:06:37 +00:00
if (previewing) {
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 20:00:46 +00:00
Size2 ss = Size2(ProjectSettings::get_singleton()->get("display/window/size/width"), ProjectSettings::get_singleton()->get("display/window/size/height"));
Vector2.get_aspect() renamed to Vector2.aspect() to keep consistent method naming
2017-01-13 23:00:43 +00:00
float aspect = ss.aspect();
Camera Fixes -=-=-=-=-=-= -Object Picking and orthogonal camera related functions fixed (i hope) -Going to preview mode in the camera shows a frame with the correct game aspect ratio -Changed Camera API and properties a little t make it more straightforward -Fixed bug in shader compiler. -Fixed bug in ShaderGL
2014-09-15 23:06:37 +00:00
Size2 s = get_size();
Rect2 draw_rect;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
switch (previewing->get_keep_aspect_mode()) {
Camera Fixes -=-=-=-=-=-= -Object Picking and orthogonal camera related functions fixed (i hope) -Going to preview mode in the camera shows a frame with the correct game aspect ratio -Changed Camera API and properties a little t make it more straightforward -Fixed bug in shader compiler. -Fixed bug in ShaderGL
2014-09-15 23:06:37 +00:00
case Camera::KEEP_WIDTH: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
draw_rect.size = Size2(s.width, s.width / aspect);
renamed all Rect2.pos to Rect2.position
2017-06-03 22:25:13 +00:00
draw_rect.position.x = 0;
draw_rect.position.y = (s.height - draw_rect.size.y) * 0.5;
Camera Fixes -=-=-=-=-=-= -Object Picking and orthogonal camera related functions fixed (i hope) -Going to preview mode in the camera shows a frame with the correct game aspect ratio -Changed Camera API and properties a little t make it more straightforward -Fixed bug in shader compiler. -Fixed bug in ShaderGL
2014-09-15 23:06:37 +00:00
} break;
case Camera::KEEP_HEIGHT: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
draw_rect.size = Size2(s.height * aspect, s.height);
renamed all Rect2.pos to Rect2.position
2017-06-03 22:25:13 +00:00
draw_rect.position.y = 0;
draw_rect.position.x = (s.width - draw_rect.size.x) * 0.5;
Camera Fixes -=-=-=-=-=-= -Object Picking and orthogonal camera related functions fixed (i hope) -Going to preview mode in the camera shows a frame with the correct game aspect ratio -Changed Camera API and properties a little t make it more straightforward -Fixed bug in shader compiler. -Fixed bug in ShaderGL
2014-09-15 23:06:37 +00:00
} break;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
draw_rect = Rect2(Vector2(), s).clip(draw_rect);
Camera Fixes -=-=-=-=-=-= -Object Picking and orthogonal camera related functions fixed (i hope) -Going to preview mode in the camera shows a frame with the correct game aspect ratio -Changed Camera API and properties a little t make it more straightforward -Fixed bug in shader compiler. -Fixed bug in ShaderGL
2014-09-15 23:06:37 +00:00
Added icon under zoom/speed indicator bar
2017-10-15 19:20:51 +00:00
stroke_rect(*surface, draw_rect, Color(0.6, 0.6, 0.1, 0.5), 2.0);
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
} else {
if (zoom_indicator_delay > 0.0) {
Added icon under zoom/speed indicator bar
2017-10-15 19:20:51 +00:00
if (is_freelook_active()) {
// Show speed
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Added icon under zoom/speed indicator bar
2017-10-15 19:20:51 +00:00
real_t min_speed = FREELOOK_MIN_SPEED;
real_t max_speed = camera->get_zfar();
real_t scale_length = (max_speed - min_speed);
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Added icon under zoom/speed indicator bar
2017-10-15 19:20:51 +00:00
if (Math::abs(scale_length) > CMP_EPSILON) {
real_t logscale_t = 1.0 - Math::log(1 + freelook_speed - min_speed) / Math::log(1 + scale_length);
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Added icon under zoom/speed indicator bar
2017-10-15 19:20:51 +00:00
// There is no real maximum speed so that factor can become negative,
// Let's make it look asymptotic instead (will decrease slower and slower).
if (logscale_t < 0.25)
logscale_t = 0.25 * Math::exp(4.0 * logscale_t - 1.0);
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Added icon under zoom/speed indicator bar
2017-10-15 19:20:51 +00:00
draw_indicator_bar(*surface, 1.0 - logscale_t, get_icon("ViewportSpeed", "EditorIcons"));
}
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Added icon under zoom/speed indicator bar
2017-10-15 19:20:51 +00:00
} else {
// Show zoom
real_t min_distance = ZOOM_MIN_DISTANCE; // TODO Why not pick znear to limit zoom?
real_t max_distance = camera->get_zfar();
real_t scale_length = (max_distance - min_distance);
if (Math::abs(scale_length) > CMP_EPSILON) {
real_t logscale_t = 1.0 - Math::log(1 + cursor.distance - min_distance) / Math::log(1 + scale_length);
// There is no real maximum distance so that factor can become negative,
// Let's make it look asymptotic instead (will decrease slower and slower).
if (logscale_t < 0.25)
logscale_t = 0.25 * Math::exp(4.0 * logscale_t - 1.0);
draw_indicator_bar(*surface, logscale_t, get_icon("ViewportZoom", "EditorIcons"));
}
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
}
}
Camera Fixes -=-=-=-=-=-= -Object Picking and orthogonal camera related functions fixed (i hope) -Going to preview mode in the camera shows a frame with the correct game aspect ratio -Changed Camera API and properties a little t make it more straightforward -Fixed bug in shader compiler. -Fixed bug in ShaderGL
2014-09-15 23:06:37 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void SpatialEditorViewport::_menu_option(int p_option) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
switch (p_option) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case VIEW_TOP: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cursor.x_rot = Math_PI / 2.0;
cursor.y_rot = 0;
name = TTR("Top");
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
_update_name();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case VIEW_BOTTOM: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cursor.x_rot = -Math_PI / 2.0;
cursor.y_rot = 0;
name = TTR("Bottom");
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
_update_name();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case VIEW_LEFT: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cursor.y_rot = Math_PI / 2.0;
cursor.x_rot = 0;
name = TTR("Left");
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
_update_name();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case VIEW_RIGHT: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cursor.y_rot = -Math_PI / 2.0;
cursor.x_rot = 0;
name = TTR("Right");
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
_update_name();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case VIEW_FRONT: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cursor.y_rot = 0;
cursor.x_rot = 0;
name = TTR("Front");
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
_update_name();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case VIEW_REAR: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cursor.y_rot = Math_PI;
cursor.x_rot = 0;
name = TTR("Rear");
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
_update_name();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Add shortcut to reset cursor position in 3D Editor ( #166 ) The shortcut will focus the origin after you moved around with shift + mouse3. The default shortcut is the letter "O", like "F" for focus. This can be customized in the editor shortcuts menu. Closes #166
2016-10-04 18:39:38 +00:00
} break;
case VIEW_CENTER_TO_ORIGIN: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cursor.pos = Vector3(0, 0, 0);
Add shortcut to reset cursor position in 3D Editor ( #166 ) The shortcut will focus the origin after you moved around with shift + mouse3. The default shortcut is the letter "O", like "F" for focus. This can be customized in the editor shortcuts menu. Closes #166
2016-10-04 18:39:38 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case VIEW_CENTER_TO_SELECTION: {
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
focus_selection();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
Add align with view in 3d editor viewport (useful for aligning camera with current view)
2014-03-31 15:06:36 +00:00
case VIEW_ALIGN_SELECTION_WITH_VIEW: {
if (!get_selected_count())
break;
Transform camera_transform = camera->get_global_transform();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
List<Node *> &selection = editor_selection->get_selected_node_list();
Add align with view in 3d editor viewport (useful for aligning camera with current view)
2014-03-31 15:06:36 +00:00
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
undo_redo->create_action(TTR("Align with view"));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
Add align with view in 3d editor viewport (useful for aligning camera with current view)
2014-03-31 15:06:36 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->get());
Add align with view in 3d editor viewport (useful for aligning camera with current view)
2014-03-31 15:06:36 +00:00
if (!sp)
continue;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
SpatialEditorSelectedItem *se = editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
Add align with view in 3d editor viewport (useful for aligning camera with current view)
2014-03-31 15:06:36 +00:00
if (!se)
continue;
Fix "Align with view" undo, fixes #1443
2015-10-29 23:44:12 +00:00
Transform xform = camera_transform;
xform.scale_basis(sp->get_scale());
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
undo_redo->add_do_method(sp, "set_global_transform", xform);
undo_redo->add_undo_method(sp, "set_global_transform", sp->get_global_transform());
Add align with view in 3d editor viewport (useful for aligning camera with current view)
2014-03-31 15:06:36 +00:00
}
undo_redo->commit_action();
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case VIEW_ENVIRONMENT: {
int idx = view_menu->get_popup()->get_item_index(VIEW_ENVIRONMENT);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
bool current = view_menu->get_popup()->is_item_checked(idx);
current = !current;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (current) {
camera->set_environment(RES());
} else {
camera->set_environment(SpatialEditor::get_singleton()->get_viewport_environment());
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(idx, current);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case VIEW_PERSPECTIVE: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), true);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL), false);
orthogonal = false;
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
call_deferred("update_transform_gizmo_view");
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
_update_name();
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case VIEW_ORTHOGONAL: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL), true);
orthogonal = true;
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
call_deferred("update_transform_gizmo_view");
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
_update_name();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
case VIEW_AUDIO_LISTENER: {
int idx = view_menu->get_popup()->get_item_index(VIEW_AUDIO_LISTENER);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
bool current = view_menu->get_popup()->is_item_checked(idx);
current = !current;
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
viewport->set_as_audio_listener(current);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(idx, current);
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 04:23:10 +00:00
} break;
case VIEW_AUDIO_DOPPLER: {
int idx = view_menu->get_popup()->get_item_index(VIEW_AUDIO_DOPPLER);
bool current = view_menu->get_popup()->is_item_checked(idx);
current = !current;
camera->set_doppler_tracking(current ? Camera::DOPPLER_TRACKING_IDLE_STEP : Camera::DOPPLER_TRACKING_DISABLED);
view_menu->get_popup()->set_item_checked(idx, current);
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
} break;
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
case VIEW_GIZMOS: {
int idx = view_menu->get_popup()->get_item_index(VIEW_GIZMOS);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
bool current = view_menu->get_popup()->is_item_checked(idx);
current = !current;
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
if (current)
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
camera->set_cull_mask(((1 << 20) - 1) | (1 << (GIZMO_BASE_LAYER + index)) | (1 << GIZMO_EDIT_LAYER) | (1 << GIZMO_GRID_LAYER));
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
else
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
camera->set_cull_mask(((1 << 20) - 1) | (1 << (GIZMO_BASE_LAYER + index)) | (1 << GIZMO_GRID_LAYER));
view_menu->get_popup()->set_item_checked(idx, current);
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
Restored everything related to information polling, and added information box for viewport.
2017-06-11 21:13:04 +00:00
} break;
Ability to shrink 3D viewport by half
2017-10-31 17:23:25 +00:00
case VIEW_HALF_RESOLUTION: {
int idx = view_menu->get_popup()->get_item_index(VIEW_HALF_RESOLUTION);
bool current = view_menu->get_popup()->is_item_checked(idx);
current = !current;
view_menu->get_popup()->set_item_checked(idx, current);
} break;
Restored everything related to information polling, and added information box for viewport.
2017-06-11 21:13:04 +00:00
case VIEW_INFORMATION: {
int idx = view_menu->get_popup()->get_item_index(VIEW_INFORMATION);
bool current = view_menu->get_popup()->is_item_checked(idx);
view_menu->get_popup()->set_item_checked(idx, !current);
Add "View FPS" in 3D->Perspective's popup. "Fixes" to make it acceptable by clang-format. "Fixes" to make it acceptable by clang-format.
2017-11-19 20:00:16 +00:00
} break;
case VIEW_FPS: {
int idx = view_menu->get_popup()->get_item_index(VIEW_FPS);
bool current = view_menu->get_popup()->is_item_checked(idx);
view_menu->get_popup()->set_item_checked(idx, !current);
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
} break;
Restored multiple viewport function, as well as view modes.
2017-06-11 18:52:03 +00:00
case VIEW_DISPLAY_NORMAL: {
viewport->set_debug_draw(Viewport::DEBUG_DRAW_DISABLED);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_NORMAL), true);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_WIREFRAME), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_OVERDRAW), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_SHADELESS), false);
} break;
case VIEW_DISPLAY_WIREFRAME: {
viewport->set_debug_draw(Viewport::DEBUG_DRAW_WIREFRAME);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_NORMAL), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_WIREFRAME), true);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_OVERDRAW), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_SHADELESS), false);
} break;
case VIEW_DISPLAY_OVERDRAW: {
viewport->set_debug_draw(Viewport::DEBUG_DRAW_OVERDRAW);
VisualServer::get_singleton()->scenario_set_debug(get_tree()->get_root()->get_world()->get_scenario(), VisualServer::SCENARIO_DEBUG_OVERDRAW);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_NORMAL), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_WIREFRAME), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_OVERDRAW), true);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_SHADELESS), false);
} break;
case VIEW_DISPLAY_SHADELESS: {
viewport->set_debug_draw(Viewport::DEBUG_DRAW_UNSHADED);
VisualServer::get_singleton()->scenario_set_debug(get_tree()->get_root()->get_world()->get_scenario(), VisualServer::SCENARIO_DEBUG_SHADELESS);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_NORMAL), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_WIREFRAME), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_OVERDRAW), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_SHADELESS), true);
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
void SpatialEditorViewport::_preview_exited_scene() {
preview_camera->set_pressed(false);
_toggle_camera_preview(false);
view_menu->show();
}
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
void SpatialEditorViewport::_init_gizmo_instance(int p_idx) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
uint32_t layer = 1 << (GIZMO_BASE_LAYER + p_idx); //|(1<<GIZMO_GRID_LAYER);
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
move_gizmo_instance[i] = VS::get_singleton()->instance_create();
VS::get_singleton()->instance_set_base(move_gizmo_instance[i], spatial_editor->get_move_gizmo(i)->get_rid());
VS::get_singleton()->instance_set_scenario(move_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario());
VS::get_singleton()->instance_set_visible(move_gizmo_instance[i], false);
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
//VS::get_singleton()->instance_geometry_set_flag(move_gizmo_instance[i],VS::INSTANCE_FLAG_DEPH_SCALE,true);
Added extra controls to GeometryInstances to control how they should cast shadows: double-sided and shadows only. Conflicts: servers/visual/visual_server_raster.h
2016-03-07 23:00:55 +00:00
VS::get_singleton()->instance_geometry_set_cast_shadows_setting(move_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
VS::get_singleton()->instance_set_layer_mask(move_gizmo_instance[i], layer);
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
move_plane_gizmo_instance[i] = VS::get_singleton()->instance_create();
VS::get_singleton()->instance_set_base(move_plane_gizmo_instance[i], spatial_editor->get_move_plane_gizmo(i)->get_rid());
VS::get_singleton()->instance_set_scenario(move_plane_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario());
VS::get_singleton()->instance_set_visible(move_plane_gizmo_instance[i], false);
//VS::get_singleton()->instance_geometry_set_flag(move_plane_gizmo_instance[i],VS::INSTANCE_FLAG_DEPH_SCALE,true);
VS::get_singleton()->instance_geometry_set_cast_shadows_setting(move_plane_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF);
VS::get_singleton()->instance_set_layer_mask(move_plane_gizmo_instance[i], layer);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
rotate_gizmo_instance[i] = VS::get_singleton()->instance_create();
VS::get_singleton()->instance_set_base(rotate_gizmo_instance[i], spatial_editor->get_rotate_gizmo(i)->get_rid());
VS::get_singleton()->instance_set_scenario(rotate_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario());
VS::get_singleton()->instance_set_visible(rotate_gizmo_instance[i], false);
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
//VS::get_singleton()->instance_geometry_set_flag(rotate_gizmo_instance[i],VS::INSTANCE_FLAG_DEPH_SCALE,true);
Added extra controls to GeometryInstances to control how they should cast shadows: double-sided and shadows only. Conflicts: servers/visual/visual_server_raster.h
2016-03-07 23:00:55 +00:00
VS::get_singleton()->instance_geometry_set_cast_shadows_setting(rotate_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
VS::get_singleton()->instance_set_layer_mask(rotate_gizmo_instance[i], layer);
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
scale_gizmo_instance[i] = VS::get_singleton()->instance_create();
VS::get_singleton()->instance_set_base(scale_gizmo_instance[i], spatial_editor->get_scale_gizmo(i)->get_rid());
VS::get_singleton()->instance_set_scenario(scale_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario());
VS::get_singleton()->instance_set_visible(scale_gizmo_instance[i], false);
//VS::get_singleton()->instance_geometry_set_flag(scale_gizmo_instance[i],VS::INSTANCE_FLAG_DEPH_SCALE,true);
VS::get_singleton()->instance_geometry_set_cast_shadows_setting(scale_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF);
VS::get_singleton()->instance_set_layer_mask(scale_gizmo_instance[i], layer);
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
scale_plane_gizmo_instance[i] = VS::get_singleton()->instance_create();
VS::get_singleton()->instance_set_base(scale_plane_gizmo_instance[i], spatial_editor->get_scale_plane_gizmo(i)->get_rid());
VS::get_singleton()->instance_set_scenario(scale_plane_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario());
VS::get_singleton()->instance_set_visible(scale_plane_gizmo_instance[i], false);
//VS::get_singleton()->instance_geometry_set_flag(scale_plane_gizmo_instance[i],VS::INSTANCE_FLAG_DEPH_SCALE,true);
VS::get_singleton()->instance_geometry_set_cast_shadows_setting(scale_plane_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF);
VS::get_singleton()->instance_set_layer_mask(scale_plane_gizmo_instance[i], layer);
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
}
}
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-20 22:38:02 +00:00
void SpatialEditorViewport::_finish_gizmo_instances() {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-20 22:38:02 +00:00
VS::get_singleton()->free(move_gizmo_instance[i]);
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
VS::get_singleton()->free(move_plane_gizmo_instance[i]);
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-20 22:38:02 +00:00
VS::get_singleton()->free(rotate_gizmo_instance[i]);
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
VS::get_singleton()->free(scale_gizmo_instance[i]);
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
VS::get_singleton()->free(scale_plane_gizmo_instance[i]);
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-20 22:38:02 +00:00
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void SpatialEditorViewport::_toggle_camera_preview(bool p_activate) {
ERR_FAIL_COND(p_activate && !preview);
ERR_FAIL_COND(!p_activate && !previewing);
if (!p_activate) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
previewing->disconnect("tree_exited", this, "_preview_exited_scene");
previewing = NULL;
VS::get_singleton()->viewport_attach_camera(viewport->get_viewport_rid(), camera->get_camera()); //restore
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!preview)
preview_camera->hide();
view_menu->show();
Camera Fixes -=-=-=-=-=-= -Object Picking and orthogonal camera related functions fixed (i hope) -Going to preview mode in the camera shows a frame with the correct game aspect ratio -Changed Camera API and properties a little t make it more straightforward -Fixed bug in shader compiler. -Fixed bug in ShaderGL
2014-09-15 23:06:37 +00:00
surface->update();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
previewing = preview;
previewing->connect("tree_exited", this, "_preview_exited_scene");
VS::get_singleton()->viewport_attach_camera(viewport->get_viewport_rid(), preview->get_camera()); //replace
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
view_menu->hide();
Camera Fixes -=-=-=-=-=-= -Object Picking and orthogonal camera related functions fixed (i hope) -Going to preview mode in the camera shows a frame with the correct game aspect ratio -Changed Camera API and properties a little t make it more straightforward -Fixed bug in shader compiler. -Fixed bug in ShaderGL
2014-09-15 23:06:37 +00:00
surface->update();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
void SpatialEditorViewport::_selection_result_pressed(int p_result) {
if (selection_results.size() <= p_result)
return;
Makes all Godot API's methods Lower Case
2017-08-07 10:17:31 +00:00
clicked = selection_results[p_result].item->get_instance_id();
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
if (clicked) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
_select_clicked(clicked_wants_append, true);
clicked = 0;
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
}
}
void SpatialEditorViewport::_selection_menu_hide() {
selection_results.clear();
selection_menu->clear();
selection_menu->set_size(Vector2(0, 0));
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditorViewport::set_can_preview(Camera *p_preview) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
preview = p_preview;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!preview_camera->is_pressed()) {
if (p_preview) {
preview_camera->show();
} else {
preview_camera->hide();
}
}
}
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
void SpatialEditorViewport::update_transform_gizmo_view() {
New API for visibility in both CanvasItem and Spatial visible (property) - access set_visible(bool) is_visible() is_visible_in_tree() - true when visible and parents visible show() hide() - for convenience
2017-01-13 13:45:50 +00:00
if (!is_visible_in_tree())
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
return;
Transform xform = spatial_editor->get_gizmo_transform();
Transform camera_xform = camera->get_transform();
Vector3 camz = -camera_xform.get_basis().get_axis(2).normalized();
Vector3 camy = -camera_xform.get_basis().get_axis(1).normalized();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Plane p(camera_xform.origin, camz);
float gizmo_d = Math::abs(p.distance_to(xform.origin));
float d0 = camera->unproject_position(camera_xform.origin + camz * gizmo_d).y;
float d1 = camera->unproject_position(camera_xform.origin + camz * gizmo_d + camy).y;
float dd = Math::abs(d0 - d1);
if (dd == 0)
dd = 0.0001;
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Editor settings categories are now tidy and beautiful!
2017-01-05 22:41:36 +00:00
float gsize = EditorSettings::get_singleton()->get("editors/3d/manipulator_gizmo_size");
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
gizmo_scale = (gsize / Math::abs(dd));
Vector3 scale = Vector3(1, 1, 1) * gizmo_scale;
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
xform.basis.scale(scale);
//xform.basis.scale(GIZMO_SCALE_DEFAULT*Vector3(1,1,1));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
VisualServer::get_singleton()->instance_set_transform(move_gizmo_instance[i], xform);
VisualServer::get_singleton()->instance_set_visible(move_gizmo_instance[i], spatial_editor->is_gizmo_visible() && (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_MOVE));
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
VisualServer::get_singleton()->instance_set_transform(move_plane_gizmo_instance[i], xform);
VisualServer::get_singleton()->instance_set_visible(move_plane_gizmo_instance[i], spatial_editor->is_gizmo_visible() && (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_MOVE));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
VisualServer::get_singleton()->instance_set_transform(rotate_gizmo_instance[i], xform);
VisualServer::get_singleton()->instance_set_visible(rotate_gizmo_instance[i], spatial_editor->is_gizmo_visible() && (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_ROTATE));
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
VisualServer::get_singleton()->instance_set_transform(scale_gizmo_instance[i], xform);
VisualServer::get_singleton()->instance_set_visible(scale_gizmo_instance[i], spatial_editor->is_gizmo_visible() && (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SCALE));
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
VisualServer::get_singleton()->instance_set_transform(scale_plane_gizmo_instance[i], xform);
VisualServer::get_singleton()->instance_set_visible(scale_plane_gizmo_instance[i], spatial_editor->is_gizmo_visible() && (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SCALE));
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
}
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditorViewport::set_state(const Dictionary &p_state) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
cursor.pos = p_state["position"];
cursor.x_rot = p_state["x_rotation"];
cursor.y_rot = p_state["y_rotation"];
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cursor.distance = p_state["distance"];
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
bool env = p_state["use_environment"];
bool orth = p_state["use_orthogonal"];
if (orth)
_menu_option(VIEW_ORTHOGONAL);
else
_menu_option(VIEW_PERSPECTIVE);
if (env != camera->get_environment().is_valid())
_menu_option(VIEW_ENVIRONMENT);
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
if (p_state.has("listener")) {
bool listener = p_state["listener"];
int idx = view_menu->get_popup()->get_item_index(VIEW_AUDIO_LISTENER);
viewport->set_as_audio_listener(listener);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(idx, listener);
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
}
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 04:23:10 +00:00
if (p_state.has("doppler")) {
bool doppler = p_state["doppler"];
int idx = view_menu->get_popup()->get_item_index(VIEW_AUDIO_DOPPLER);
camera->set_doppler_tracking(doppler ? Camera::DOPPLER_TRACKING_IDLE_STEP : Camera::DOPPLER_TRACKING_DISABLED);
view_menu->get_popup()->set_item_checked(idx, doppler);
}
Improve/fix SpatialEditor state saving/restoring
2017-11-20 00:45:56 +00:00
if (p_state.has("gizmos")) {
bool gizmos = p_state["gizmos"];
int idx = view_menu->get_popup()->get_item_index(VIEW_GIZMOS);
if (view_menu->get_popup()->is_item_checked(idx) != gizmos)
_menu_option(VIEW_GIZMOS);
}
if (p_state.has("information")) {
bool information = p_state["information"];
int idx = view_menu->get_popup()->get_item_index(VIEW_INFORMATION);
if (view_menu->get_popup()->is_item_checked(idx) != information)
_menu_option(VIEW_INFORMATION);
}
Ability to shrink 3D viewport by half
2017-10-31 17:23:25 +00:00
if (p_state.has("half_res")) {
bool half_res = p_state["half_res"];
int idx = view_menu->get_popup()->get_item_index(VIEW_HALF_RESOLUTION);
view_menu->get_popup()->set_item_checked(idx, half_res);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
-Properly keep animation editor and viewport state while switching scene tabs
2015-08-30 01:59:25 +00:00
if (p_state.has("previewing")) {
Node *pv = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["previewing"]);
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
if (Object::cast_to<Camera>(pv)) {
previewing = Object::cast_to<Camera>(pv);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
previewing->connect("tree_exited", this, "_preview_exited_scene");
VS::get_singleton()->viewport_attach_camera(viewport->get_viewport_rid(), previewing->get_camera()); //replace
-Properly keep animation editor and viewport state while switching scene tabs
2015-08-30 01:59:25 +00:00
view_menu->hide();
surface->update();
preview_camera->set_pressed(true);
preview_camera->show();
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Dictionary SpatialEditorViewport::get_state() const {
Dictionary d;
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
d["position"] = cursor.pos;
d["x_rotation"] = cursor.x_rot;
d["y_rotation"] = cursor.y_rot;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
d["distance"] = cursor.distance;
d["use_environment"] = camera->get_environment().is_valid();
d["use_orthogonal"] = camera->get_projection() == Camera::PROJECTION_ORTHOGONAL;
d["listener"] = viewport->is_audio_listener();
Improve/fix SpatialEditor state saving/restoring
2017-11-20 00:45:56 +00:00
d["doppler"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUDIO_DOPPLER));
d["gizmos"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_GIZMOS));
d["information"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_INFORMATION));
Ability to shrink 3D viewport by half
2017-10-31 17:23:25 +00:00
d["half_res"] = viewport_container->get_stretch_shrink() > 1;
-Properly keep animation editor and viewport state while switching scene tabs
2015-08-30 01:59:25 +00:00
if (previewing) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
d["previewing"] = EditorNode::get_singleton()->get_edited_scene()->get_path_to(previewing);
-Properly keep animation editor and viewport state while switching scene tabs
2015-08-30 01:59:25 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return d;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditorViewport::_bind_methods() {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ClassDB::bind_method(D_METHOD("_draw"), &SpatialEditorViewport::_draw);
ClassDB::bind_method(D_METHOD("_smouseenter"), &SpatialEditorViewport::_smouseenter);
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
ClassDB::bind_method(D_METHOD("_smouseexit"), &SpatialEditorViewport::_smouseexit);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ClassDB::bind_method(D_METHOD("_sinput"), &SpatialEditorViewport::_sinput);
ClassDB::bind_method(D_METHOD("_menu_option"), &SpatialEditorViewport::_menu_option);
ClassDB::bind_method(D_METHOD("_toggle_camera_preview"), &SpatialEditorViewport::_toggle_camera_preview);
ClassDB::bind_method(D_METHOD("_preview_exited_scene"), &SpatialEditorViewport::_preview_exited_scene);
ClassDB::bind_method(D_METHOD("update_transform_gizmo_view"), &SpatialEditorViewport::update_transform_gizmo_view);
ClassDB::bind_method(D_METHOD("_selection_result_pressed"), &SpatialEditorViewport::_selection_result_pressed);
ClassDB::bind_method(D_METHOD("_selection_menu_hide"), &SpatialEditorViewport::_selection_menu_hide);
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &SpatialEditorViewport::can_drop_data_fw);
ClassDB::bind_method(D_METHOD("drop_data_fw"), &SpatialEditorViewport::drop_data_fw);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ADD_SIGNAL(MethodInfo("toggle_maximize_view", PropertyInfo(Variant::OBJECT, "viewport")));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Fixing Issues... - #672 (default user:// in $HOME/.godot/app_userdata (linux/osx) and $APPDATA/Godot/app_userdata (Windows) - #676 (draw both tiles and octants in order from top to bottom, left to right ) - #686 (unicode escape sequences work now) - #702 (was not a bug, but a test was added to see if bodies went too far away)
2014-09-19 21:39:50 +00:00
void SpatialEditorViewport::reset() {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
orthogonal = false;
message_time = 0;
message = "";
last_message = "";
name = "";
Fixing Issues... - #672 (default user:// in $HOME/.godot/app_userdata (linux/osx) and $APPDATA/Godot/app_userdata (Windows) - #676 (draw both tiles and octants in order from top to bottom, left to right ) - #686 (unicode escape sequences work now) - #702 (was not a bug, but a test was added to see if bodies went too far away)
2014-09-19 21:39:50 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cursor.x_rot = 0.5;
cursor.y_rot = 0.5;
cursor.distance = 4;
cursor.region_select = false;
Return camera to origin when creating a new scene and going to 3d editor.
2017-10-15 00:05:09 +00:00
cursor.pos = Vector3();
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
_update_name();
Fixing Issues... - #672 (default user:// in $HOME/.godot/app_userdata (linux/osx) and $APPDATA/Godot/app_userdata (Windows) - #676 (draw both tiles and octants in order from top to bottom, left to right ) - #686 (unicode escape sequences work now) - #702 (was not a bug, but a test was added to see if bodies went too far away)
2014-09-19 21:39:50 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
void SpatialEditorViewport::focus_selection() {
if (!get_selected_count())
return;
Vector3 center;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
int count = 0;
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
List<Node *> &selection = editor_selection->get_selected_node_list();
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->get());
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
if (!sp)
continue;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
SpatialEditorSelectedItem *se = editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
if (!se)
continue;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
center += sp->get_global_transform().origin;
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
count++;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (count != 0) {
center /= float(count);
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cursor.pos = center;
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
}
Rename Rect3 to AABB. Fixes #12973.
2017-11-17 02:09:00 +00:00
void SpatialEditorViewport::assign_pending_data_pointers(Spatial *p_preview_node, AABB *p_preview_bounds, AcceptDialog *p_accept) {
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
preview_node = p_preview_node;
preview_bounds = p_preview_bounds;
accept = p_accept;
}
Vector3 SpatialEditorViewport::_get_instance_position(const Point2 &p_pos) const {
const float MAX_DISTANCE = 10;
Vector3 world_ray = _get_ray(p_pos);
Vector3 world_pos = _get_ray_pos(p_pos);
Vector<ObjectID> instances = VisualServer::get_singleton()->instances_cull_ray(world_pos, world_ray, get_tree()->get_root()->get_world()->get_scenario());
Set<Ref<SpatialEditorGizmo> > found_gizmos;
float closest_dist = MAX_DISTANCE;
Vector3 point = world_pos + world_ray * MAX_DISTANCE;
Vector3 normal = Vector3(0.0, 0.0, 0.0);
for (int i = 0; i < instances.size(); i++) {
MeshInstance *mesh_instance = Object::cast_to<MeshInstance>(ObjectDB::get_instance(instances[i]));
if (!mesh_instance)
continue;
Ref<SpatialEditorGizmo> seg = mesh_instance->get_gizmo();
if ((!seg.is_valid()) || found_gizmos.has(seg)) {
continue;
}
found_gizmos.insert(seg);
Vector3 hit_point;
Vector3 hit_normal;
bool inters = seg->intersect_ray(camera, p_pos, hit_point, hit_normal, NULL, false);
if (!inters)
continue;
float dist = world_pos.distance_to(hit_point);
if (dist < 0)
continue;
if (dist < closest_dist) {
closest_dist = dist;
point = hit_point;
normal = hit_normal;
}
}
Fix drag and drop collision with non-centred origin points.
2017-10-18 04:16:05 +00:00
Vector3 offset = Vector3();
for (int i = 0; i < 3; i++) {
if (normal[i] > 0.0)
offset[i] = (preview_bounds->get_size()[i] - (preview_bounds->get_size()[i] + preview_bounds->get_position()[i]));
else if (normal[i] < 0.0)
offset[i] = -(preview_bounds->get_size()[i] + preview_bounds->get_position()[i]);
}
return point + offset;
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
}
Rename Rect3 to AABB. Fixes #12973.
2017-11-17 02:09:00 +00:00
AABB SpatialEditorViewport::_calculate_spatial_bounds(const Spatial *p_parent, const AABB p_bounds) {
AABB bounds = p_bounds;
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
for (int i = 0; i < p_parent->get_child_count(); i++) {
Spatial *child = Object::cast_to<Spatial>(p_parent->get_child(i));
if (child) {
MeshInstance *mesh_instance = Object::cast_to<MeshInstance>(child);
if (mesh_instance) {
Rename Rect3 to AABB. Fixes #12973.
2017-11-17 02:09:00 +00:00
AABB mesh_instance_bounds = mesh_instance->get_aabb();
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
mesh_instance_bounds.position += mesh_instance->get_global_transform().origin - p_parent->get_global_transform().origin;
bounds.merge_with(mesh_instance_bounds);
}
bounds = _calculate_spatial_bounds(child, bounds);
}
}
return bounds;
}
void SpatialEditorViewport::_create_preview(const Vector<String> &files) const {
for (int i = 0; i < files.size(); i++) {
String path = files[i];
RES res = ResourceLoader::load(path);
Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res));
Drag and drop for meshes directly and fix drop restriction for non-Texture objects in canvas editor.
2017-09-16 13:57:17 +00:00
Ref<Mesh> mesh = Ref<Mesh>(Object::cast_to<Mesh>(*res));
if (mesh != NULL || scene != NULL) {
if (mesh != NULL) {
MeshInstance *mesh_instance = memnew(MeshInstance);
mesh_instance->set_mesh(mesh);
preview_node->add_child(mesh_instance);
} else {
if (scene.is_valid()) {
Node *instance = scene->instance();
if (instance) {
preview_node->add_child(instance);
}
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
}
}
editor->get_scene_root()->add_child(preview_node);
}
}
Rename Rect3 to AABB. Fixes #12973.
2017-11-17 02:09:00 +00:00
*preview_bounds = _calculate_spatial_bounds(preview_node, AABB());
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
}
void SpatialEditorViewport::_remove_preview() {
if (preview_node->get_parent()) {
for (int i = preview_node->get_child_count() - 1; i >= 0; i--) {
Node *node = preview_node->get_child(i);
node->queue_delete();
preview_node->remove_child(node);
}
editor->get_scene_root()->remove_child(preview_node);
}
}
bool SpatialEditorViewport::_cyclical_dependency_exists(const String &p_target_scene_path, Node *p_desired_node) {
if (p_desired_node->get_filename() == p_target_scene_path) {
return true;
}
int childCount = p_desired_node->get_child_count();
for (int i = 0; i < childCount; i++) {
Node *child = p_desired_node->get_child(i);
if (_cyclical_dependency_exists(p_target_scene_path, child)) {
return true;
}
}
return false;
}
bool SpatialEditorViewport::_create_instance(Node *parent, String &path, const Point2 &p_point) {
Drag and drop for meshes directly and fix drop restriction for non-Texture objects in canvas editor.
2017-09-16 13:57:17 +00:00
RES res = ResourceLoader::load(path);
Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res));
Ref<Mesh> mesh = Ref<Mesh>(Object::cast_to<Mesh>(*res));
Node *instanced_scene = NULL;
if (mesh != NULL || scene != NULL) {
if (mesh != NULL) {
MeshInstance *mesh_instance = memnew(MeshInstance);
mesh_instance->set_mesh(mesh);
mesh_instance->set_name(mesh->get_name());
instanced_scene = mesh_instance;
} else {
if (!scene.is_valid()) { // invalid scene
return false;
} else {
instanced_scene = scene->instance();
}
}
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
}
Drag and drop for meshes directly and fix drop restriction for non-Texture objects in canvas editor.
2017-09-16 13:57:17 +00:00
if (instanced_scene == NULL) {
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
return false;
}
if (editor->get_edited_scene()->get_filename() != "") { // cyclical instancing
if (_cyclical_dependency_exists(editor->get_edited_scene()->get_filename(), instanced_scene)) {
memdelete(instanced_scene);
return false;
}
}
Dropping a mesh file into the scene no longer creates an instanced scene.
2017-11-10 21:31:53 +00:00
if (scene != NULL) {
instanced_scene->set_filename(ProjectSettings::get_singleton()->localize_path(path));
}
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
editor_data->get_undo_redo().add_do_method(parent, "add_child", instanced_scene);
editor_data->get_undo_redo().add_do_method(instanced_scene, "set_owner", editor->get_edited_scene());
editor_data->get_undo_redo().add_do_reference(instanced_scene);
editor_data->get_undo_redo().add_undo_method(parent, "remove_child", instanced_scene);
String new_name = parent->validate_child_name(instanced_scene);
ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
editor_data->get_undo_redo().add_do_method(sed, "live_debug_instance_node", editor->get_edited_scene()->get_path_to(parent), path, new_name);
editor_data->get_undo_redo().add_undo_method(sed, "live_debug_remove_node", NodePath(String(editor->get_edited_scene()->get_path_to(parent)) + "/" + new_name));
Transform global_transform;
Spatial *parent_spatial = Object::cast_to<Spatial>(parent);
if (parent_spatial)
global_transform = parent_spatial->get_global_transform();
Added snapping to spatial drag and drop.
2017-09-18 21:44:04 +00:00
global_transform.origin = spatial_editor->snap_point(_get_instance_position(p_point));
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
editor_data->get_undo_redo().add_do_method(instanced_scene, "set_global_transform", global_transform);
return true;
}
void SpatialEditorViewport::_perform_drop_data() {
_remove_preview();
Vector<String> error_files;
editor_data->get_undo_redo().create_action(TTR("Create Node"));
for (int i = 0; i < selected_files.size(); i++) {
String path = selected_files[i];
RES res = ResourceLoader::load(path);
if (res.is_null()) {
continue;
}
Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res));
Drag and drop for meshes directly and fix drop restriction for non-Texture objects in canvas editor.
2017-09-16 13:57:17 +00:00
Ref<Mesh> mesh = Ref<Mesh>(Object::cast_to<Mesh>(*res));
if (mesh != NULL || scene != NULL) {
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
bool success = _create_instance(target_node, path, drop_pos);
if (!success) {
error_files.push_back(path);
}
}
}
editor_data->get_undo_redo().commit_action();
if (error_files.size() > 0) {
String files_str;
for (int i = 0; i < error_files.size(); i++) {
files_str += error_files[i].get_file().get_basename() + ",";
}
files_str = files_str.substr(0, files_str.length() - 1);
accept->get_ok()->set_text(TTR("Ugh"));
accept->set_text(vformat(TTR("Error instancing scene from %s"), files_str.c_str()));
accept->popup_centered_minsize();
}
}
bool SpatialEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
bool can_instance = false;
if (!preview_node->is_inside_tree()) {
Dictionary d = p_data;
if (d.has("type") && (String(d["type"]) == "files")) {
Vector<String> files = d["files"];
List<String> scene_extensions;
ResourceLoader::get_recognized_extensions_for_type("PackedScene", &scene_extensions);
Drag and drop for meshes directly and fix drop restriction for non-Texture objects in canvas editor.
2017-09-16 13:57:17 +00:00
List<String> mesh_extensions;
ResourceLoader::get_recognized_extensions_for_type("Mesh", &mesh_extensions);
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
for (int i = 0; i < files.size(); i++) {
Drag and drop for meshes directly and fix drop restriction for non-Texture objects in canvas editor.
2017-09-16 13:57:17 +00:00
if (mesh_extensions.find(files[i].get_extension()) || scene_extensions.find(files[i].get_extension())) {
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
RES res = ResourceLoader::load(files[i]);
if (res.is_null()) {
continue;
}
String type = res->get_class();
if (type == "PackedScene") {
Ref<PackedScene> sdata = ResourceLoader::load(files[i]);
Node *instanced_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE);
if (!instanced_scene) {
continue;
}
memdelete(instanced_scene);
Drag and drop for meshes directly and fix drop restriction for non-Texture objects in canvas editor.
2017-09-16 13:57:17 +00:00
} else if (type == "Mesh" || "ArrayMesh" || "PrimitiveMesh") {
Ref<Mesh> mesh = ResourceLoader::load(files[i]);
if (!mesh.is_valid()) {
continue;
}
} else {
continue;
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
}
can_instance = true;
break;
}
}
if (can_instance) {
_create_preview(files);
}
}
} else {
can_instance = true;
}
if (can_instance) {
Transform global_transform = Transform(Basis(), _get_instance_position(p_point));
preview_node->set_global_transform(global_transform);
}
return can_instance;
}
void SpatialEditorViewport::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
if (!can_drop_data_fw(p_point, p_data, p_from))
return;
bool is_shift = Input::get_singleton()->is_key_pressed(KEY_SHIFT);
selected_files.clear();
Dictionary d = p_data;
if (d.has("type") && String(d["type"]) == "files") {
selected_files = d["files"];
}
List<Node *> list = editor->get_editor_selection()->get_selected_node_list();
if (list.size() == 0) {
Node *root_node = editor->get_edited_scene();
if (root_node) {
list.push_back(root_node);
} else {
accept->get_ok()->set_text(TTR("OK :("));
accept->set_text(TTR("No parent to instance a child at."));
accept->popup_centered_minsize();
_remove_preview();
return;
}
}
if (list.size() != 1) {
accept->get_ok()->set_text(TTR("I see.."));
accept->set_text(TTR("This operation requires a single selected node."));
accept->popup_centered_minsize();
_remove_preview();
return;
}
target_node = list[0];
if (is_shift && target_node != editor->get_edited_scene()) {
target_node = target_node->get_parent();
}
drop_pos = p_point;
_perform_drop_data();
}
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, EditorNode *p_editor, int p_index) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
_edit.mode = TRANSFORM_NONE;
_edit.plane = TRANSFORM_VIEW;
_edit.edited_gizmo = 0;
_edit.snap = 1;
_edit.gizmo_handle = 0;
index = p_index;
editor = p_editor;
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
editor_data = editor->get_scene_tree_dock()->get_editor_data();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
editor_selection = editor->get_editor_selection();
undo_redo = editor->get_undo_redo();
clicked = 0;
clicked_includes_current = false;
orthogonal = false;
message_time = 0;
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
zoom_indicator_delay = 0.0;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
spatial_editor = p_spatial_editor;
ViewportContainer *c = memnew(ViewportContainer);
Ability to shrink 3D viewport by half
2017-10-31 17:23:25 +00:00
viewport_container = c;
Everything returning to normal in 3D, still a long way to go -implemented the scene part of visual server and rasterizer, objects without lighting and material are rendererd only
2016-10-19 14:14:41 +00:00
c->set_stretch(true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(c);
Remove set_area_as_parent_rect and replace it by set_anchors_and_margins_preset(PRESET_WIDE)
2017-09-21 22:12:33 +00:00
c->set_anchors_and_margins_preset(Control::PRESET_WIDE);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
viewport = memnew(Viewport);
-fixed bug related to mouse cursor changes, fixes #3366
2016-01-18 22:49:11 +00:00
viewport->set_disable_input(true);
all light types and shadows are working, pending a lot of clean-up
2016-11-10 02:55:06 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
c->add_child(viewport);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
surface = memnew(Control);
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
surface->set_drag_forwarding(this);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(surface);
Remove set_area_as_parent_rect and replace it by set_anchors_and_margins_preset(PRESET_WIDE)
2017-09-21 22:12:33 +00:00
surface->set_anchors_and_margins_preset(Control::PRESET_WIDE);
Restored everything related to information polling, and added information box for viewport.
2017-06-11 21:13:04 +00:00
surface->set_clip_contents(true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
camera = memnew(Camera);
camera->set_disable_gizmo(true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
camera->set_cull_mask(((1 << 20) - 1) | (1 << (GIZMO_BASE_LAYER + p_index)) | (1 << GIZMO_EDIT_LAYER) | (1 << GIZMO_GRID_LAYER));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//camera->set_environment(SpatialEditor::get_singleton()->get_viewport_environment());
viewport->add_child(camera);
camera->make_current();
surface->set_focus_mode(FOCUS_ALL);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu = memnew(MenuButton);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
surface->add_child(view_menu);
SpatialEditor: fix "Top", overflow preview button
2017-08-04 13:46:22 +00:00
view_menu->set_position(Point2(4, 4) * EDSCALE);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->set_self_modulate(Color(1, 1, 1, 0.5));
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/top_view"), VIEW_TOP);
view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/bottom_view"), VIEW_BOTTOM);
view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/left_view"), VIEW_LEFT);
view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/right_view"), VIEW_RIGHT);
view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/front_view"), VIEW_FRONT);
view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/rear_view"), VIEW_REAR);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
view_menu->get_popup()->add_separator();
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
view_menu->get_popup()->add_check_item(TTR("Perspective") + " (" + ED_GET_SHORTCUT("spatial_editor/switch_perspective_orthogonal")->get_as_text() + ")", VIEW_PERSPECTIVE);
view_menu->get_popup()->add_check_item(TTR("Orthogonal") + " (" + ED_GET_SHORTCUT("spatial_editor/switch_perspective_orthogonal")->get_as_text() + ")", VIEW_ORTHOGONAL);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
view_menu->get_popup()->add_separator();
Restored multiple viewport function, as well as view modes.
2017-06-11 18:52:03 +00:00
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_normal", TTR("Display Normal")), VIEW_DISPLAY_NORMAL);
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_wireframe", TTR("Display Wireframe")), VIEW_DISPLAY_WIREFRAME);
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_overdraw", TTR("Display Overdraw")), VIEW_DISPLAY_OVERDRAW);
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_unshaded", TTR("Display Unshaded")), VIEW_DISPLAY_SHADELESS);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_NORMAL), true);
view_menu->get_popup()->add_separator();
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_environment", TTR("View Environment")), VIEW_ENVIRONMENT);
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_gizmos", TTR("View Gizmos")), VIEW_GIZMOS);
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_information", TTR("View Information")), VIEW_INFORMATION);
Add "View FPS" in 3D->Perspective's popup. "Fixes" to make it acceptable by clang-format. "Fixes" to make it acceptable by clang-format.
2017-11-19 20:00:16 +00:00
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_fps", TTR("View FPS")), VIEW_FPS);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_ENVIRONMENT), true);
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
view_menu->get_popup()->add_separator();
Ability to shrink 3D viewport by half
2017-10-31 17:23:25 +00:00
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_half_resolution", TTR("Half Resolution")), VIEW_HALF_RESOLUTION);
view_menu->get_popup()->add_separator();
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_audio_listener", TTR("Audio Listener")), VIEW_AUDIO_LISTENER);
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 04:23:10 +00:00
view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_audio_doppler", TTR("Doppler Enable")), VIEW_AUDIO_DOPPLER);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_GIZMOS), true);
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
view_menu->get_popup()->add_separator();
Add shortcut to reset cursor position in 3D Editor ( #166 ) The shortcut will focus the origin after you moved around with shift + mouse3. The default shortcut is the letter "O", like "F" for focus. This can be customized in the editor shortcuts menu. Closes #166
2016-10-04 18:39:38 +00:00
view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/focus_origin"), VIEW_CENTER_TO_ORIGIN);
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/focus_selection"), VIEW_CENTER_TO_SELECTION);
view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/align_selection_with_view"), VIEW_ALIGN_SELECTION_WITH_VIEW);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->connect("id_pressed", this, "_menu_option");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Initialize freelook shortcuts properly
2017-07-27 02:00:23 +00:00
ED_SHORTCUT("spatial_editor/freelook_left", TTR("Freelook Left"), KEY_A);
ED_SHORTCUT("spatial_editor/freelook_right", TTR("Freelook Right"), KEY_D);
ED_SHORTCUT("spatial_editor/freelook_forward", TTR("Freelook Forward"), KEY_W);
ED_SHORTCUT("spatial_editor/freelook_backwards", TTR("Freelook Backwards"), KEY_S);
swapped up down shortcut for freelook (to fit unreal)
2017-09-13 23:36:42 +00:00
ED_SHORTCUT("spatial_editor/freelook_up", TTR("Freelook Up"), KEY_E);
ED_SHORTCUT("spatial_editor/freelook_down", TTR("Freelook Down"), KEY_Q);
Initialize freelook shortcuts properly
2017-07-27 02:00:23 +00:00
ED_SHORTCUT("spatial_editor/freelook_speed_modifier", TTR("Freelook Speed Modifier"), KEY_SHIFT);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
preview_camera = memnew(Button);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
preview_camera->set_toggle_mode(true);
Replace GUI anchor type by a float between 0 and 1
2017-07-06 07:16:27 +00:00
preview_camera->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, -90 * EDSCALE);
SpatialEditor: fix "Top", overflow preview button
2017-08-04 13:46:22 +00:00
preview_camera->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 10 * EDSCALE);
Fix alignment for button preview_camera
2017-12-02 11:45:25 +00:00
preview_camera->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, -10 * EDSCALE);
preview_camera->set_h_grow_direction(GROW_DIRECTION_BEGIN);
Editor: Add some more translatable strings.
2017-08-23 20:25:14 +00:00
preview_camera->set_text(TTR("preview"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
surface->add_child(preview_camera);
preview_camera->hide();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
preview_camera->connect("toggled", this, "_toggle_camera_preview");
previewing = NULL;
gizmo_scale = 1.0;
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
preview_node = NULL;
Restored everything related to information polling, and added information box for viewport.
2017-06-11 21:13:04 +00:00
info = memnew(PanelContainer);
info->set_self_modulate(Color(1, 1, 1, 0.4));
surface->add_child(info);
info_label = memnew(Label);
info->add_child(info_label);
info->hide();
Add "View FPS" in 3D->Perspective's popup. "Fixes" to make it acceptable by clang-format. "Fixes" to make it acceptable by clang-format.
2017-11-19 20:00:16 +00:00
// FPS Counter.
fps = memnew(PanelContainer);
fps->set_self_modulate(Color(1, 1, 1, 0.4));
surface->add_child(fps);
fps_label = memnew(Label);
fps->add_child(fps_label);
fps->hide();
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
accept = NULL;
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
freelook_active = false;
Freelook interpolation fixes - Smooth freelook position more explicitely - Don't let orbit zoom produce translation when it shouldn't - Make base speed framerate-independent (and tweaked setting for that) - Don't rely on camera for calculations because it no longer reflect immediate state - Avoid potential divide-by-zero with zoom inertia - Make speed/zoom relation optional (if enabled, speed is adjusted from zoom) - Never change zoom distance when freelook is active - Orbit inertia also applies on freelook
2017-10-08 00:43:57 +00:00
freelook_speed = EditorSettings::get_singleton()->get("editors/3d/freelook/freelook_base_speed");
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
selection_menu = memnew(PopupMenu);
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
add_child(selection_menu);
SpatialEditor: fix "Top", overflow preview button
2017-08-04 13:46:22 +00:00
selection_menu->set_custom_minimum_size(Size2(100, 0) * EDSCALE);
PopupMenu now emits both index_pressed and id_pressed instead of item_pressed, closes #3188
2017-01-08 21:18:54 +00:00
selection_menu->connect("id_pressed", this, "_selection_result_pressed");
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
selection_menu->connect("popup_hide", this, "_selection_menu_hide");
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_index == 0) {
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUDIO_LISTENER), true);
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
viewport->set_as_audio_listener(true);
}
SpatialEditor: fix "Top", overflow preview button
2017-08-04 13:46:22 +00:00
name = "";
Fix issue #931: display current view name into editor's 3d scene viewports
2015-03-21 20:47:21 +00:00
_update_name();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
EditorSettings::get_singleton()->connect("settings_changed", this, "update_transform_gizmo_view");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Multiple 3D viewports are not operational.
2017-06-11 14:29:27 +00:00
//////////////////////////////////////////////////////////////
void SpatialEditorViewportContainer::_gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> mb = p_event;
if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
Vector2 size = get_size();
int h_sep = get_constant("separation", "HSplitContainer");
int v_sep = get_constant("separation", "VSplitContainer");
int mid_w = size.width * ratio_h;
int mid_h = size.height * ratio_v;
dragging_h = mb->get_position().x > (mid_w - h_sep / 2) && mb->get_position().x < (mid_w + h_sep / 2);
dragging_v = mb->get_position().y > (mid_h - v_sep / 2) && mb->get_position().y < (mid_h + v_sep / 2);
drag_begin_pos = mb->get_position();
drag_begin_ratio.x = ratio_h;
drag_begin_ratio.y = ratio_v;
switch (view) {
case VIEW_USE_1_VIEWPORT: {
dragging_h = false;
dragging_v = false;
} break;
case VIEW_USE_2_VIEWPORTS: {
dragging_h = false;
} break;
case VIEW_USE_2_VIEWPORTS_ALT: {
dragging_v = false;
} break;
case VIEW_USE_3_VIEWPORTS: {
if (dragging_v)
dragging_h = false;
else
dragging_v = false;
} break;
case VIEW_USE_3_VIEWPORTS_ALT: {
if (dragging_h)
dragging_v = false;
else
dragging_h = false;
} break;
case VIEW_USE_4_VIEWPORTS: {
} break;
}
}
if (mb.is_valid() && !mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
dragging_h = false;
dragging_v = false;
}
Ref<InputEventMouseMotion> mm = p_event;
if (mm.is_valid() && (dragging_h || dragging_v)) {
if (dragging_h) {
float new_ratio = drag_begin_ratio.x + (mm->get_position().x - drag_begin_pos.x) / get_size().width;
new_ratio = CLAMP(new_ratio, 40 / get_size().width, (get_size().width - 40) / get_size().width);
ratio_h = new_ratio;
queue_sort();
update();
}
if (dragging_v) {
float new_ratio = drag_begin_ratio.y + (mm->get_position().y - drag_begin_pos.y) / get_size().height;
new_ratio = CLAMP(new_ratio, 40 / get_size().height, (get_size().height - 40) / get_size().height);
ratio_v = new_ratio;
queue_sort();
update();
}
}
}
void SpatialEditorViewportContainer::_notification(int p_what) {
if (p_what == NOTIFICATION_MOUSE_ENTER || p_what == NOTIFICATION_MOUSE_EXIT) {
mouseover = (p_what == NOTIFICATION_MOUSE_ENTER);
update();
}
if (p_what == NOTIFICATION_DRAW && mouseover) {
Ref<Texture> h_grabber = get_icon("grabber", "HSplitContainer");
Ref<Texture> v_grabber = get_icon("grabber", "VSplitContainer");
Vector2 size = get_size();
int h_sep = get_constant("separation", "HSplitContainer");
int v_sep = get_constant("separation", "VSplitContainer");
int mid_w = size.width * ratio_h;
int mid_h = size.height * ratio_v;
int size_left = mid_w - h_sep / 2;
int size_bottom = size.height - mid_h - v_sep / 2;
switch (view) {
case VIEW_USE_1_VIEWPORT: {
//nothing to show
} break;
case VIEW_USE_2_VIEWPORTS: {
draw_texture(v_grabber, Vector2((size.width - v_grabber->get_width()) / 2, mid_h - v_grabber->get_height() / 2));
} break;
case VIEW_USE_2_VIEWPORTS_ALT: {
draw_texture(h_grabber, Vector2(mid_w - h_grabber->get_width() / 2, (size.height - h_grabber->get_height()) / 2));
} break;
case VIEW_USE_3_VIEWPORTS: {
draw_texture(v_grabber, Vector2((size.width - v_grabber->get_width()) / 2, mid_h - v_grabber->get_height() / 2));
draw_texture(h_grabber, Vector2(mid_w - h_grabber->get_width() / 2, mid_h + v_grabber->get_height() / 2 + (size_bottom - h_grabber->get_height()) / 2));
} break;
case VIEW_USE_3_VIEWPORTS_ALT: {
draw_texture(v_grabber, Vector2((size_left - v_grabber->get_width()) / 2, mid_h - v_grabber->get_height() / 2));
draw_texture(h_grabber, Vector2(mid_w - h_grabber->get_width() / 2, (size.height - h_grabber->get_height()) / 2));
} break;
case VIEW_USE_4_VIEWPORTS: {
Vector2 half(mid_w, mid_h);
draw_texture(v_grabber, half - v_grabber->get_size() / 2.0);
draw_texture(h_grabber, half - h_grabber->get_size() / 2.0);
} break;
}
}
if (p_what == NOTIFICATION_SORT_CHILDREN) {
SpatialEditorViewport *viewports[4];
int vc = 0;
for (int i = 0; i < get_child_count(); i++) {
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
viewports[vc] = Object::cast_to<SpatialEditorViewport>(get_child(i));
Multiple 3D viewports are not operational.
2017-06-11 14:29:27 +00:00
if (viewports[vc]) {
vc++;
}
}
ERR_FAIL_COND(vc != 4);
Size2 size = get_size();
if (size.x < 10 || size.y < 10) {
for (int i = 0; i < 4; i++) {
viewports[i]->hide();
}
return;
}
int h_sep = get_constant("separation", "HSplitContainer");
int v_sep = get_constant("separation", "VSplitContainer");
int mid_w = size.width * ratio_h;
int mid_h = size.height * ratio_v;
int size_left = mid_w - h_sep / 2;
int size_right = size.width - mid_w - h_sep / 2;
int size_top = mid_h - v_sep / 2;
int size_bottom = size.height - mid_h - v_sep / 2;
switch (view) {
case VIEW_USE_1_VIEWPORT: {
for (int i = 1; i < 4; i++) {
viewports[i]->hide();
}
fit_child_in_rect(viewports[0], Rect2(Vector2(), size));
} break;
case VIEW_USE_2_VIEWPORTS: {
for (int i = 1; i < 4; i++) {
if (i == 1 || i == 3)
viewports[i]->hide();
else
viewports[i]->show();
}
fit_child_in_rect(viewports[0], Rect2(Vector2(), Vector2(size.width, size_top)));
fit_child_in_rect(viewports[2], Rect2(Vector2(0, mid_h + v_sep / 2), Vector2(size.width, size_bottom)));
} break;
case VIEW_USE_2_VIEWPORTS_ALT: {
for (int i = 1; i < 4; i++) {
if (i == 1 || i == 3)
viewports[i]->hide();
else
viewports[i]->show();
}
fit_child_in_rect(viewports[0], Rect2(Vector2(), Vector2(size_left, size.height)));
fit_child_in_rect(viewports[2], Rect2(Vector2(mid_w + h_sep / 2, 0), Vector2(size_right, size.height)));
} break;
case VIEW_USE_3_VIEWPORTS: {
for (int i = 1; i < 4; i++) {
if (i == 1)
viewports[i]->hide();
else
viewports[i]->show();
}
fit_child_in_rect(viewports[0], Rect2(Vector2(), Vector2(size.width, size_top)));
fit_child_in_rect(viewports[2], Rect2(Vector2(0, mid_h + v_sep / 2), Vector2(size_left, size_bottom)));
fit_child_in_rect(viewports[3], Rect2(Vector2(mid_w + h_sep / 2, mid_h + v_sep / 2), Vector2(size_right, size_bottom)));
} break;
case VIEW_USE_3_VIEWPORTS_ALT: {
for (int i = 1; i < 4; i++) {
if (i == 1)
viewports[i]->hide();
else
viewports[i]->show();
}
fit_child_in_rect(viewports[0], Rect2(Vector2(), Vector2(size_left, size_top)));
fit_child_in_rect(viewports[2], Rect2(Vector2(0, mid_h + v_sep / 2), Vector2(size_left, size_bottom)));
fit_child_in_rect(viewports[3], Rect2(Vector2(mid_w + h_sep / 2, 0), Vector2(size_right, size.height)));
} break;
case VIEW_USE_4_VIEWPORTS: {
for (int i = 1; i < 4; i++) {
viewports[i]->show();
}
fit_child_in_rect(viewports[0], Rect2(Vector2(), Vector2(size_left, size_top)));
fit_child_in_rect(viewports[1], Rect2(Vector2(mid_w + h_sep / 2, 0), Vector2(size_right, size_top)));
fit_child_in_rect(viewports[2], Rect2(Vector2(0, mid_h + v_sep / 2), Vector2(size_left, size_bottom)));
fit_child_in_rect(viewports[3], Rect2(Vector2(mid_w + h_sep / 2, mid_h + v_sep / 2), Vector2(size_right, size_bottom)));
} break;
}
}
}
void SpatialEditorViewportContainer::set_view(View p_view) {
view = p_view;
queue_sort();
}
SpatialEditorViewportContainer::View SpatialEditorViewportContainer::get_view() {
return view;
}
void SpatialEditorViewportContainer::_bind_methods() {
ClassDB::bind_method("_gui_input", &SpatialEditorViewportContainer::_gui_input);
}
SpatialEditorViewportContainer::SpatialEditorViewportContainer() {
view = VIEW_USE_1_VIEWPORT;
mouseover = false;
ratio_h = 0.5;
ratio_v = 0.5;
dragging_v = false;
dragging_h = false;
}
///////////////////////////////////////////////////////////////////
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
SpatialEditor *SpatialEditor::singleton = NULL;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
SpatialEditorSelectedItem::~SpatialEditorSelectedItem() {
if (sbox_instance.is_valid())
VisualServer::get_singleton()->free(sbox_instance);
}
Fix highlight typo
2017-04-06 15:35:08 +00:00
void SpatialEditor::select_gizmo_highlight_axis(int p_axis) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
move_gizmo[i]->surface_set_material(0, i == p_axis ? gizmo_hl : gizmo_color[i]);
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
move_plane_gizmo[i]->surface_set_material(0, (i + 6) == p_axis ? gizmo_hl : plane_gizmo_color[i]);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
rotate_gizmo[i]->surface_set_material(0, (i + 3) == p_axis ? gizmo_hl : gizmo_color[i]);
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
scale_gizmo[i]->surface_set_material(0, (i + 9) == p_axis ? gizmo_hl : gizmo_color[i]);
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
scale_plane_gizmo[i]->surface_set_material(0, (i + 12) == p_axis ? gizmo_hl : plane_gizmo_color[i]);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Implemented skeleton visibility Removed code visibility code from popup menu
2017-11-22 21:29:27 +00:00
int SpatialEditor::get_skeleton_visibility_state() const {
return view_menu->get_popup()->get_item_state(view_menu->get_popup()->get_item_index(MENU_VISIBILITY_SKELETON));
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void SpatialEditor::update_transform_gizmo() {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
List<Node *> &selection = editor_selection->get_selected_node_list();
Rename Rect3 to AABB. Fixes #12973.
2017-11-17 02:09:00 +00:00
AABB center;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
bool first = true;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Type renames: Matrix32 -> Transform2D Matrix3 -> Basis AABB -> Rect3 RawArray -> PoolByteArray IntArray -> PoolIntArray FloatArray -> PoolFloatArray Vector2Array -> PoolVector2Array Vector3Array -> PoolVector3Array ColorArray -> PoolColorArray
2017-01-11 03:52:51 +00:00
Basis gizmo_basis;
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
bool local_gizmo_coords = are_local_coords_enabled();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->get());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!sp)
continue;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
SpatialEditorSelectedItem *se = editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!se)
continue;
Transform xf = se->sp->get_global_transform();
if (first) {
renamed all Rect3.pos to Rect3.position
2017-06-06 18:33:51 +00:00
center.position = xf.origin;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
first = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (local_gizmo_coords) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
gizmo_basis = xf.basis;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
gizmo_basis.orthonormalize();
}
} else {
center.expand_to(xf.origin);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
gizmo_basis = Basis();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Style: Fix whole-line commented code They do not play well with clang-format which aligns the `//` part with the rest of the code block, thus producing badly indented commented code.
2017-01-14 11:26:56 +00:00
//count++;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
renamed all Rect3.pos to Rect3.position
2017-06-06 18:33:51 +00:00
Vector3 pcenter = center.position + center.size * 0.5;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
gizmo.visible = !first;
gizmo.transform.origin = pcenter;
gizmo.transform.basis = gizmo_basis;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix signed and unsigned comparisons The first in my quest to make Godot 3.x compile with -Werror on GCC7
2017-08-31 21:30:35 +00:00
for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
viewports[i]->update_transform_gizmo_view();
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Implemented skeleton visibility Removed code visibility code from popup menu
2017-11-22 21:29:27 +00:00
void _update_all_gizmos(Node *p_node) {
for (int i = p_node->get_child_count() - 1; 0 <= i; --i) {
Spatial *spatial_node = Object::cast_to<Spatial>(p_node->get_child(i));
if (spatial_node) {
spatial_node->update_gizmo();
}
_update_all_gizmos(p_node->get_child(i));
}
}
void SpatialEditor::update_all_gizmos() {
_update_all_gizmos(SceneTree::get_singleton()->get_root());
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Object *SpatialEditor::_get_editor_data(Object *p_what) {
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(p_what);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!sp)
return NULL;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
SpatialEditorSelectedItem *si = memnew(SpatialEditorSelectedItem);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
si->sp = sp;
si->sbox_instance = VisualServer::get_singleton()->instance_create2(selection_box->get_rid(), sp->get_world()->get_scenario());
Added extra controls to GeometryInstances to control how they should cast shadows: double-sided and shadows only. Conflicts: servers/visual/visual_server_raster.h
2016-03-07 23:00:55 +00:00
VS::get_singleton()->instance_geometry_set_cast_shadows_setting(si->sbox_instance, VS::SHADOW_CASTING_SETTING_OFF);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removes editor_hint from SceneTree
2017-08-18 23:02:56 +00:00
if (Engine::get_singleton()->is_editor_hint())
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
editor->call("edit_node", sp);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return si;
}
void SpatialEditor::_generate_selection_box() {
Rename Rect3 to AABB. Fixes #12973.
2017-11-17 02:09:00 +00:00
AABB aabb(Vector3(), Vector3(1, 1, 1));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
aabb.grow_by(aabb.get_longest_axis_size() / 20.0);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Ref<SurfaceTool> st = memnew(SurfaceTool);
remove trailing whitespace
2016-03-08 23:00:52 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
st->begin(Mesh::PRIMITIVE_LINES);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 12; i++) {
remove trailing whitespace
2016-03-08 23:00:52 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector3 a, b;
aabb.get_edge(i, a, b);
remove trailing whitespace
2016-03-08 23:00:52 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/*Vector<Vector3> points;
remove trailing whitespace
2016-03-08 23:00:52 +00:00
Vector<Color> colors;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
points.push_back(a);
points.push_back(b);*/
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
st->add_color(Color(1.0, 1.0, 0.8, 0.8));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
st->add_vertex(a);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
st->add_color(Color(1.0, 1.0, 0.8, 0.4));
st->add_vertex(a.linear_interpolate(b, 0.2));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
st->add_color(Color(1.0, 1.0, 0.8, 0.4));
st->add_vertex(a.linear_interpolate(b, 0.8));
st->add_color(Color(1.0, 1.0, 0.8, 0.8));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
st->add_vertex(b);
}
New particle system, mostly working, some small features missing.
2017-04-07 02:36:37 +00:00
Ref<SpatialMaterial> mat = memnew(SpatialMaterial);
mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
mat->set_albedo(Color(1, 1, 1));
New particle system, mostly working, some small features missing.
2017-04-07 02:36:37 +00:00
mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
mat->set_flag(SpatialMaterial::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
mat->set_flag(SpatialMaterial::FLAG_SRGB_VERTEX_COLOR, true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
st->set_material(mat);
selection_box = st->commit();
}
Dictionary SpatialEditor::get_state() const {
Dictionary d;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
d["snap_enabled"] = snap_enabled;
d["translate_snap"] = get_translate_snap();
d["rotate_snap"] = get_rotate_snap();
d["scale_snap"] = get_scale_snap();
Moved Local Space Mode and Transform Snap settings to Top Bar ... ...buttons for easier access.
2017-11-18 18:51:37 +00:00
d["local_coords"] = tool_option_button[TOOL_OPT_LOCAL_COORDS]->is_pressed();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
int vc = 0;
if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT)))
vc = 1;
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS)))
vc = 2;
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS)))
vc = 3;
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS)))
vc = 4;
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT)))
vc = 5;
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT)))
vc = 6;
d["viewport_mode"] = vc;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Array vpdata;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 4; i++) {
vpdata.push_back(viewports[i]->get_state());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
d["viewports"] = vpdata;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
d["show_grid"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_GRID));
d["show_origin"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN));
d["fov"] = get_fov();
d["znear"] = get_znear();
d["zfar"] = get_zfar();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return d;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditor::set_state(const Dictionary &p_state) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Dictionary d = p_state;
Remember Transform menu settings for the Spatial Editor
2016-01-10 20:59:12 +00:00
if (d.has("snap_enabled")) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
snap_enabled = d["snap_enabled"];
Moved Local Space Mode and Transform Snap settings to Top Bar ... ...buttons for easier access.
2017-11-18 18:51:37 +00:00
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_pressed(d["snap_enabled"]);
Remember Transform menu settings for the Spatial Editor
2016-01-10 20:59:12 +00:00
}
if (d.has("translate_snap"))
snap_translate->set_text(d["translate_snap"]);
if (d.has("rotate_snap"))
snap_rotate->set_text(d["rotate_snap"]);
if (d.has("scale_snap"))
snap_scale->set_text(d["scale_snap"]);
if (d.has("local_coords")) {
Moved Local Space Mode and Transform Snap settings to Top Bar ... ...buttons for easier access.
2017-11-18 18:51:37 +00:00
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_pressed(d["local_coords"]);
Remember Transform menu settings for the Spatial Editor
2016-01-10 20:59:12 +00:00
update_transform_gizmo();
}
Remove unnecessary fail conditions when loading SpatialEditor state
2016-01-11 13:35:11 +00:00
if (d.has("viewport_mode")) {
int vc = d["viewport_mode"];
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (vc == 1)
Remove unnecessary fail conditions when loading SpatialEditor state
2016-01-11 13:35:11 +00:00
_menu_item_pressed(MENU_VIEW_USE_1_VIEWPORT);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
else if (vc == 2)
Remove unnecessary fail conditions when loading SpatialEditor state
2016-01-11 13:35:11 +00:00
_menu_item_pressed(MENU_VIEW_USE_2_VIEWPORTS);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
else if (vc == 3)
Remove unnecessary fail conditions when loading SpatialEditor state
2016-01-11 13:35:11 +00:00
_menu_item_pressed(MENU_VIEW_USE_3_VIEWPORTS);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
else if (vc == 4)
Remove unnecessary fail conditions when loading SpatialEditor state
2016-01-11 13:35:11 +00:00
_menu_item_pressed(MENU_VIEW_USE_4_VIEWPORTS);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
else if (vc == 5)
Remove unnecessary fail conditions when loading SpatialEditor state
2016-01-11 13:35:11 +00:00
_menu_item_pressed(MENU_VIEW_USE_2_VIEWPORTS_ALT);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
else if (vc == 6)
Remove unnecessary fail conditions when loading SpatialEditor state
2016-01-11 13:35:11 +00:00
_menu_item_pressed(MENU_VIEW_USE_3_VIEWPORTS_ALT);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Remove unnecessary fail conditions when loading SpatialEditor state
2016-01-11 13:35:11 +00:00
if (d.has("viewports")) {
Array vp = d["viewports"];
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ERR_FAIL_COND(vp.size() > 4);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix signed and unsigned comparisons The first in my quest to make Godot 3.x compile with -Werror on GCC7
2017-08-31 21:30:35 +00:00
for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
Remove unnecessary fail conditions when loading SpatialEditor state
2016-01-11 13:35:11 +00:00
viewports[i]->set_state(vp[i]);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
if (d.has("zfar"))
-Conversion of most properties to a simpler syntax, easier to use by script -Modified help to display properties GDScript can still not make use of them, though.
2017-01-04 04:16:14 +00:00
settings_zfar->set_value(float(d["zfar"]));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (d.has("znear"))
-Conversion of most properties to a simpler syntax, easier to use by script -Modified help to display properties GDScript can still not make use of them, though.
2017-01-04 04:16:14 +00:00
settings_znear->set_value(float(d["znear"]));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (d.has("fov"))
-Conversion of most properties to a simpler syntax, easier to use by script -Modified help to display properties GDScript can still not make use of them, though.
2017-01-04 04:16:14 +00:00
settings_fov->set_value(float(d["fov"]));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (d.has("show_grid")) {
bool use = d["show_grid"];
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (use != view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_GRID))) {
Make sure View Grid state saved with scene state
2014-07-15 07:06:55 +00:00
_menu_item_pressed(MENU_VIEW_GRID);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
if (d.has("show_origin")) {
bool use = d["show_origin"];
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (use != view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN))) {
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN), use);
VisualServer::get_singleton()->instance_set_visible(origin_instance, use);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
}
void SpatialEditor::edit(Spatial *p_spatial) {
remove trailing whitespace
2016-03-08 23:00:52 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_spatial != selected) {
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
if (selected) {
Ref<SpatialEditorGizmo> seg = selected->get_gizmo();
if (seg.is_valid()) {
seg->set_selected(false);
selected->update_gizmo();
}
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
selected = p_spatial;
over_gizmo_handle = -1;
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
if (selected) {
Ref<SpatialEditorGizmo> seg = selected->get_gizmo();
if (seg.is_valid()) {
seg->set_selected(true);
selected->update_gizmo();
}
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Style: Fix whole-line commented code They do not play well with clang-format which aligns the `//` part with the rest of the code block, thus producing badly indented commented code.
2017-01-14 11:26:56 +00:00
/*
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (p_spatial) {
Style: Fix whole-line commented code They do not play well with clang-format which aligns the `//` part with the rest of the code block, thus producing badly indented commented code.
2017-01-14 11:26:56 +00:00
_validate_selection();
Makes all Godot API's methods Lower Case
2017-08-07 10:17:31 +00:00
if (selected.has(p_spatial->get_instance_id()) && selected.size()==1)
Style: Fix whole-line commented code They do not play well with clang-format which aligns the `//` part with the rest of the code block, thus producing badly indented commented code.
2017-01-14 11:26:56 +00:00
return;
Makes all Godot API's methods Lower Case
2017-08-07 10:17:31 +00:00
_select(p_spatial->get_instance_id(),false,true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
// should become the selection
}
Style: Fix whole-line commented code They do not play well with clang-format which aligns the `//` part with the rest of the code block, thus producing badly indented commented code.
2017-01-14 11:26:56 +00:00
*/
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void SpatialEditor::_xform_dialog_action() {
Transform t;
//translation
Vector3 scale;
Vector3 rotate;
Vector3 translate;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
translate[i] = xform_translate[i]->get_text().to_double();
rotate[i] = Math::deg2rad(xform_rotate[i]->get_text().to_double());
scale[i] = xform_scale[i]->get_text().to_double();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Fix the order in which additional transformations are applied in Matrix3 and Transform. This is a part of the breaking changes proposed in PR #6865, solving the issue regarding the order of affine transformations described in #2565. This PR also fixes the affected code within Godot codebase. Includes improvements to documentation too. Another change is, Matrix3::get_scale() will now return negative scaling when the determinant of the matrix is negative. The rationale behind this is simple: when performing a polar decomposition on a basis matrix M = R.S, we have to ensure that the determinant of R is +1, such that it is a proper rotation matrix (with no reflections) which can be represented by Euler angles or a quaternion. Also replaced the few instances of float with real_t in Matrix3 and Transform. Furthermore, this PR fixes an issue introduced due to the API breakage in #6865. Namely Matrix3::get_euler() now only works with proper rotation matrices. As a result, the code that wants to get the rotation portion of a transform needs to use Matrix3::get_rotation() introduced in this commit, which complements Matrix3::get_scaled(), providing both parts of the polar decomposition. Finally, it is now possible to construct a rotation matrix from Euler angles using the new constructor Matrix3::Matrix3(const Vector3 &p_euler).
2017-01-05 17:31:39 +00:00
t.basis.scale(scale);
t.basis.rotate(rotate);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
t.origin = translate;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
undo_redo->create_action(TTR("XForm Dialog"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
List<Node *> &selection = editor_selection->get_selected_node_list();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(E->get());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!sp)
continue;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
SpatialEditorSelectedItem *se = editor_selection->get_node_editor_data<SpatialEditorSelectedItem>(sp);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!se)
continue;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
bool post = xform_type->get_selected() > 0;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Transform tr = sp->get_global_transform();
if (post)
tr = tr * t;
else {
tr.basis = t.basis * tr.basis;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
tr.origin += t.origin;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
undo_redo->add_do_method(sp, "set_global_transform", tr);
undo_redo->add_undo_method(sp, "set_global_transform", sp->get_global_transform());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
undo_redo->commit_action();
}
Moved Local Space Mode and Transform Snap settings to Top Bar ... ...buttons for easier access.
2017-11-18 18:51:37 +00:00
void SpatialEditor::_menu_item_toggled(bool pressed, int p_option) {
switch (p_option) {
case MENU_TOOL_LOCAL_COORDS: {
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_pressed(pressed);
update_transform_gizmo();
} break;
case MENU_TOOL_USE_SNAP: {
tool_option_button[TOOL_OPT_USE_SNAP]->set_pressed(pressed);
snap_enabled = pressed;
} break;
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void SpatialEditor::_menu_item_pressed(int p_option) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
switch (p_option) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case MENU_TOOL_SELECT:
case MENU_TOOL_MOVE:
case MENU_TOOL_ROTATE:
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
case MENU_TOOL_SCALE:
case MENU_TOOL_LIST_SELECT: {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < TOOL_MAX; i++)
tool_button[i]->set_pressed(i == p_option);
tool_mode = (ToolMode)p_option;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
update_transform_gizmo();
} break;
case MENU_TRANSFORM_CONFIGURE_SNAP: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
snap_dialog->popup_centered(Size2(200, 180));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case MENU_TRANSFORM_DIALOG: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
xform_translate[i]->set_text("0");
xform_rotate[i]->set_text("0");
xform_scale[i]->set_text("1");
}
SpatialEditor: fix transform dialog
2017-07-31 13:00:02 +00:00
xform_dialog->popup_centered(Size2(320, 240) * EDSCALE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case MENU_VIEW_USE_1_VIEWPORT: {
Multiple 3D viewports are not operational.
2017-06-11 14:29:27 +00:00
viewport_base->set_view(SpatialEditorViewportContainer::VIEW_USE_1_VIEWPORT);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), true);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case MENU_VIEW_USE_2_VIEWPORTS: {
Multiple 3D viewports are not operational.
2017-06-11 14:29:27 +00:00
viewport_base->set_view(SpatialEditorViewportContainer::VIEW_USE_2_VIEWPORTS);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), true);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
Misc Bits -=-=-=-=- -Added more missing icons to nodes. -Added more 3D split view modes -Fixed annoying script editor bug with keyboard focus
2014-10-09 03:06:51 +00:00
} break;
case MENU_VIEW_USE_2_VIEWPORTS_ALT: {
Multiple 3D viewports are not operational.
2017-06-11 14:29:27 +00:00
viewport_base->set_view(SpatialEditorViewportContainer::VIEW_USE_2_VIEWPORTS_ALT);
Misc Bits -=-=-=-=- -Added more missing icons to nodes. -Added more 3D split view modes -Fixed annoying script editor bug with keyboard focus
2014-10-09 03:06:51 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), true);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case MENU_VIEW_USE_3_VIEWPORTS: {
Multiple 3D viewports are not operational.
2017-06-11 14:29:27 +00:00
viewport_base->set_view(SpatialEditorViewportContainer::VIEW_USE_3_VIEWPORTS);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), true);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
Misc Bits -=-=-=-=- -Added more missing icons to nodes. -Added more 3D split view modes -Fixed annoying script editor bug with keyboard focus
2014-10-09 03:06:51 +00:00
} break;
case MENU_VIEW_USE_3_VIEWPORTS_ALT: {
Multiple 3D viewports are not operational.
2017-06-11 14:29:27 +00:00
viewport_base->set_view(SpatialEditorViewportContainer::VIEW_USE_3_VIEWPORTS_ALT);
Misc Bits -=-=-=-=- -Added more missing icons to nodes. -Added more 3D split view modes -Fixed annoying script editor bug with keyboard focus
2014-10-09 03:06:51 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case MENU_VIEW_USE_4_VIEWPORTS: {
Multiple 3D viewports are not operational.
2017-06-11 14:29:27 +00:00
viewport_base->set_view(SpatialEditorViewportContainer::VIEW_USE_4_VIEWPORTS);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), true);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case MENU_VIEW_ORIGIN: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
bool is_checked = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(p_option));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
is_checked = !is_checked;
VisualServer::get_singleton()->instance_set_visible(origin_instance, is_checked);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(p_option), is_checked);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case MENU_VIEW_GRID: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
bool is_checked = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(p_option));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
grid_enabled = !is_checked;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; ++i) {
Fixed #470 View grid toggle in 3d not working
2014-07-15 05:29:03 +00:00
if (grid_enable[i]) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
VisualServer::get_singleton()->instance_set_visible(grid_instance[i], grid_enabled);
grid_visible[i] = grid_enabled;
Fixed #470 View grid toggle in 3d not working
2014-07-15 05:29:03 +00:00
}
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(p_option), grid_enabled);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case MENU_VIEW_CAMERA_SETTINGS: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
settings_dialog->popup_centered(settings_vbc->get_combined_minimum_size() + Size2(50, 50));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
ability to lock spatial nodes transform in editor
2017-10-23 19:21:15 +00:00
case MENU_LOCK_SELECTED: {
List<Node *> &selection = editor_selection->get_selected_node_list();
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
Spatial *spatial = Object::cast_to<Spatial>(E->get());
if (!spatial || !spatial->is_visible_in_tree())
continue;
if (spatial->get_viewport() != EditorNode::get_singleton()->get_scene_root())
continue;
spatial->set_meta("_edit_lock_", true);
emit_signal("item_lock_status_changed");
}
_refresh_menu_icons();
} break;
case MENU_UNLOCK_SELECTED: {
List<Node *> &selection = editor_selection->get_selected_node_list();
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
Spatial *spatial = Object::cast_to<Spatial>(E->get());
if (!spatial || !spatial->is_visible_in_tree())
continue;
if (spatial->get_viewport() != EditorNode::get_singleton()->get_scene_root())
continue;
spatial->set_meta("_edit_lock_", Variant());
emit_signal("item_lock_status_changed");
}
_refresh_menu_icons();
} break;
Implemented skeleton visibility Removed code visibility code from popup menu
2017-11-22 21:29:27 +00:00
case MENU_VISIBILITY_SKELETON: {
const int idx = view_menu->get_popup()->get_item_index(MENU_VISIBILITY_SKELETON);
Change statable to multistate, remove extra separator
2017-12-12 02:37:37 +00:00
view_menu->get_popup()->toggle_item_multistate(idx);
Implemented skeleton visibility Removed code visibility code from popup menu
2017-11-22 21:29:27 +00:00
// Change icon
const int state = view_menu->get_popup()->get_item_state(idx);
switch (state) {
case 0:
view_menu->get_popup()->set_item_icon(idx, view_menu->get_popup()->get_icon("visibility_hidden"));
break;
case 1:
view_menu->get_popup()->set_item_icon(idx, view_menu->get_popup()->get_icon("visibility_visible"));
break;
case 2:
view_menu->get_popup()->set_item_icon(idx, view_menu->get_popup()->get_icon("visibility_xray"));
break;
}
update_all_gizmos();
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
void SpatialEditor::_init_indicators() {
{
Style: Fix statements ending with ';;'
2017-01-14 17:03:38 +00:00
indicator_mat.instance();
New particle system, mostly working, some small features missing.
2017-04-07 02:36:37 +00:00
indicator_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
indicator_mat->set_flag(SpatialMaterial::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
indicator_mat->set_flag(SpatialMaterial::FLAG_SRGB_VERTEX_COLOR, true);
-Many many fixes -Gizmos work again
2016-10-29 23:48:09 +00:00
Memory pool vectors (DVector) have been enormously simplified in code, and renamed to PoolVector
2017-01-07 21:25:37 +00:00
PoolVector<Color> grid_colors[3];
PoolVector<Vector3> grid_points[3];
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector<Color> origin_colors;
Vector<Vector3> origin_points;
Editor settings categories are now tidy and beautiful!
2017-01-05 22:41:36 +00:00
Color grid_color = EditorSettings::get_singleton()->get("editors/3d/grid_color");
Added customisable grid color, issue 3781
2016-09-08 13:53:39 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 axis;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
axis[i] = 1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 axis_n1;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
axis_n1[(i + 1) % 3] = 1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 axis_n2;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
axis_n2[(i + 2) % 3] = 1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
origin_colors.push_back(Color(axis.x, axis.y, axis.z));
origin_colors.push_back(Color(axis.x, axis.y, axis.z));
origin_points.push_back(axis * 4096);
origin_points.push_back(axis * -4096);
Removed transparency from spatial editor grid.
2017-09-24 22:56:08 +00:00
#define ORIGIN_GRID_SIZE 50
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int j = -ORIGIN_GRID_SIZE; j <= ORIGIN_GRID_SIZE; j++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removed transparency from spatial editor grid.
2017-09-24 22:56:08 +00:00
Vector3 p1 = axis_n1 * j + axis_n2 * -ORIGIN_GRID_SIZE;
Vector3 p1_dest = p1 * (-axis_n2 + axis_n1);
Vector3 p2 = axis_n2 * j + axis_n1 * -ORIGIN_GRID_SIZE;
Vector3 p2_dest = p2 * (-axis_n1 + axis_n2);
Better looking spatial editor grid
2017-09-08 23:49:30 +00:00
Removed transparency from spatial editor grid.
2017-09-24 22:56:08 +00:00
Color line_color = grid_color;
if (j == 0) {
continue;
} else if (j % 10 == 0) {
line_color *= 1.5;
}
Better looking spatial editor grid
2017-09-08 23:49:30 +00:00
Removed transparency from spatial editor grid.
2017-09-24 22:56:08 +00:00
grid_points[i].push_back(p1);
grid_points[i].push_back(p1_dest);
grid_colors[i].push_back(line_color);
grid_colors[i].push_back(line_color);
Better looking spatial editor grid
2017-09-08 23:49:30 +00:00
Removed transparency from spatial editor grid.
2017-09-24 22:56:08 +00:00
grid_points[i].push_back(p2);
grid_points[i].push_back(p2_dest);
grid_colors[i].push_back(line_color);
grid_colors[i].push_back(line_color);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
grid[i] = VisualServer::get_singleton()->mesh_create();
Array d;
d.resize(VS::ARRAY_MAX);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
d[VisualServer::ARRAY_VERTEX] = grid_points[i];
d[VisualServer::ARRAY_COLOR] = grid_colors[i];
VisualServer::get_singleton()->mesh_add_surface_from_arrays(grid[i], VisualServer::PRIMITIVE_LINES, d);
VisualServer::get_singleton()->mesh_surface_set_material(grid[i], 0, indicator_mat->get_rid());
grid_instance[i] = VisualServer::get_singleton()->instance_create2(grid[i], get_tree()->get_root()->get_world()->get_scenario());
grid_visible[i] = false;
grid_enable[i] = false;
VisualServer::get_singleton()->instance_set_visible(grid_instance[i], false);
Added extra controls to GeometryInstances to control how they should cast shadows: double-sided and shadows only. Conflicts: servers/visual/visual_server_raster.h
2016-03-07 23:00:55 +00:00
VisualServer::get_singleton()->instance_geometry_set_cast_shadows_setting(grid_instance[i], VS::SHADOW_CASTING_SETTING_OFF);
VS::get_singleton()->instance_set_layer_mask(grid_instance[i], 1 << SpatialEditorViewport::GIZMO_GRID_LAYER);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
origin = VisualServer::get_singleton()->mesh_create();
Array d;
d.resize(VS::ARRAY_MAX);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
d[VisualServer::ARRAY_VERTEX] = origin_points;
d[VisualServer::ARRAY_COLOR] = origin_colors;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
VisualServer::get_singleton()->mesh_add_surface_from_arrays(origin, VisualServer::PRIMITIVE_LINES, d);
VisualServer::get_singleton()->mesh_surface_set_material(origin, 0, indicator_mat->get_rid());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Style: Fix whole-line commented code They do not play well with clang-format which aligns the `//` part with the rest of the code block, thus producing badly indented commented code.
2017-01-14 11:26:56 +00:00
//origin = VisualServer::get_singleton()->poly_create();
//VisualServer::get_singleton()->poly_add_primitive(origin,origin_points,Vector<Vector3>(),origin_colors,Vector<Vector3>());
//VisualServer::get_singleton()->poly_set_material(origin,indicator_mat,true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
origin_instance = VisualServer::get_singleton()->instance_create2(origin, get_tree()->get_root()->get_world()->get_scenario());
VS::get_singleton()->instance_set_layer_mask(origin_instance, 1 << SpatialEditorViewport::GIZMO_GRID_LAYER);
-added custom metadata to physics shapes (2D only for now) -gizmos are not displayed in camera preview
2014-10-16 03:06:34 +00:00
Added extra controls to GeometryInstances to control how they should cast shadows: double-sided and shadows only. Conflicts: servers/visual/visual_server_raster.h
2016-03-07 23:00:55 +00:00
VisualServer::get_singleton()->instance_geometry_set_cast_shadows_setting(origin_instance, VS::SHADOW_CASTING_SETTING_OFF);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
VisualServer::get_singleton()->instance_set_visible(grid_instance[1], true);
grid_enable[1] = true;
grid_visible[1] = true;
grid_enabled = true;
last_grid_snap = 1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
{
//move gizmo
Editor settings categories are now tidy and beautiful!
2017-01-05 22:41:36 +00:00
float gizmo_alph = EditorSettings::get_singleton()->get("editors/3d/manipulator_gizmo_opacity");
Add editor setting: Manipulator Gizmo Opacity
2014-07-15 05:05:55 +00:00
New particle system, mostly working, some small features missing.
2017-04-07 02:36:37 +00:00
gizmo_hl = Ref<SpatialMaterial>(memnew(SpatialMaterial));
gizmo_hl->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
Removed ontop property, added a material rendering priority system. Fixes #9935, closes #10135
2017-09-01 15:56:52 +00:00
gizmo_hl->set_on_top_of_alpha();
New particle system, mostly working, some small features missing.
2017-04-07 02:36:37 +00:00
gizmo_hl->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
gizmo_hl->set_albedo(Color(1, 1, 1, gizmo_alph + 0.2f));
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
gizmo_hl->set_cull_mode(SpatialMaterial::CULL_DISABLED);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
-Added proper access to depth texture from shader -Split Mesh into Mesh (abstrat class) and ArrayMesh, to allow to proper mesh primitives, as well as streamable meshes in the future.
2017-06-07 21:18:55 +00:00
move_gizmo[i] = Ref<ArrayMesh>(memnew(ArrayMesh));
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
move_plane_gizmo[i] = Ref<ArrayMesh>(memnew(ArrayMesh));
-Added proper access to depth texture from shader -Split Mesh into Mesh (abstrat class) and ArrayMesh, to allow to proper mesh primitives, as well as streamable meshes in the future.
2017-06-07 21:18:55 +00:00
rotate_gizmo[i] = Ref<ArrayMesh>(memnew(ArrayMesh));
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
scale_gizmo[i] = Ref<ArrayMesh>(memnew(ArrayMesh));
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
scale_plane_gizmo[i] = Ref<ArrayMesh>(memnew(ArrayMesh));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
New particle system, mostly working, some small features missing.
2017-04-07 02:36:37 +00:00
Ref<SpatialMaterial> mat = memnew(SpatialMaterial);
mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
Removed ontop property, added a material rendering priority system. Fixes #9935, closes #10135
2017-09-01 15:56:52 +00:00
mat->set_on_top_of_alpha();
New particle system, mostly working, some small features missing.
2017-04-07 02:36:37 +00:00
mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Color col;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
col[i] = 1.0;
col.a = gizmo_alph;
PBR more or less working, still working on bringing gizmos back
2016-10-27 14:50:26 +00:00
mat->set_albedo(col);
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
gizmo_color[i] = mat;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 ivec;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ivec[i] = 1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 nivec;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
nivec[(i + 1) % 3] = 1;
nivec[(i + 2) % 3] = 1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 ivec2;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ivec2[(i + 1) % 3] = 1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 ivec3;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ivec3[(i + 2) % 3] = 1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
//translate
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
{
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Ref<SurfaceTool> surftool = memnew(SurfaceTool);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
surftool->begin(Mesh::PRIMITIVE_TRIANGLES);
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
// Arrow profile
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
const int arrow_points = 5;
Vector3 arrow[5] = {
nivec * 0.0 + ivec * 0.0,
nivec * 0.01 + ivec * 0.0,
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
nivec * 0.01 + ivec * GIZMO_ARROW_OFFSET,
nivec * 0.065 + ivec * GIZMO_ARROW_OFFSET,
nivec * 0.0 + ivec * (GIZMO_ARROW_OFFSET + GIZMO_ARROW_SIZE),
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
};
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
int arrow_sides = 6;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
for (int k = 0; k < 6; k++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Basis ma(ivec, Math_PI * 2 * float(k) / arrow_sides);
Basis mb(ivec, Math_PI * 2 * float(k + 1) / arrow_sides);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int j = 0; j < arrow_points - 1; j++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector3 points[4] = {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
ma.xform(arrow[j]),
mb.xform(arrow[j]),
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
mb.xform(arrow[j + 1]),
ma.xform(arrow[j + 1]),
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
};
surftool->add_vertex(points[0]);
surftool->add_vertex(points[1]);
surftool->add_vertex(points[2]);
surftool->add_vertex(points[0]);
surftool->add_vertex(points[2]);
surftool->add_vertex(points[3]);
}
}
surftool->set_material(mat);
surftool->commit(move_gizmo[i]);
}
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
// Plane Translation
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
{
Ref<SurfaceTool> surftool = memnew(SurfaceTool);
surftool->begin(Mesh::PRIMITIVE_TRIANGLES);
Vector3 vec = ivec2 - ivec3;
Vector3 plane[4] = {
vec * GIZMO_PLANE_DST,
vec * GIZMO_PLANE_DST + ivec2 * GIZMO_PLANE_SIZE,
vec * (GIZMO_PLANE_DST + GIZMO_PLANE_SIZE),
vec * GIZMO_PLANE_DST - ivec3 * GIZMO_PLANE_SIZE
};
Basis ma(ivec, Math_PI / 2);
Vector3 points[4] = {
ma.xform(plane[0]),
ma.xform(plane[1]),
ma.xform(plane[2]),
ma.xform(plane[3]),
};
surftool->add_vertex(points[0]);
surftool->add_vertex(points[1]);
surftool->add_vertex(points[2]);
surftool->add_vertex(points[0]);
surftool->add_vertex(points[2]);
surftool->add_vertex(points[3]);
Ref<SpatialMaterial> plane_mat = memnew(SpatialMaterial);
plane_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
Removed ontop property, added a material rendering priority system. Fixes #9935, closes #10135
2017-09-01 15:56:52 +00:00
plane_mat->set_on_top_of_alpha();
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
plane_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
plane_mat->set_cull_mode(SpatialMaterial::CULL_DISABLED);
Color col;
col[i] = 1.0;
col.a = gizmo_alph;
plane_mat->set_albedo(col);
plane_gizmo_color[i] = plane_mat; // needed, so we can draw planes from both sides
surftool->set_material(plane_mat);
surftool->commit(move_plane_gizmo[i]);
}
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
// Rotate
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
{
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Ref<SurfaceTool> surftool = memnew(SurfaceTool);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
surftool->begin(Mesh::PRIMITIVE_TRIANGLES);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector3 circle[5] = {
Better spatial gizmo. Now it is posible to move spatial nodes along a plane.
2017-08-29 01:39:45 +00:00
ivec * 0.02 + ivec2 * 0.02 + ivec2 * GIZMO_CIRCLE_SIZE,
ivec * -0.02 + ivec2 * 0.02 + ivec2 * GIZMO_CIRCLE_SIZE,
ivec * -0.02 + ivec2 * -0.02 + ivec2 * GIZMO_CIRCLE_SIZE,
ivec * 0.02 + ivec2 * -0.02 + ivec2 * GIZMO_CIRCLE_SIZE,
ivec * 0.02 + ivec2 * 0.02 + ivec2 * GIZMO_CIRCLE_SIZE,
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
};
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
for (int k = 0; k < 32; k++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Basis ma(ivec, Math_PI * 2 * float(k) / 32);
Basis mb(ivec, Math_PI * 2 * float(k + 1) / 32);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int j = 0; j < 4; j++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Vector3 points[4] = {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
ma.xform(circle[j]),
mb.xform(circle[j]),
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
mb.xform(circle[j + 1]),
ma.xform(circle[j + 1]),
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
};
surftool->add_vertex(points[0]);
surftool->add_vertex(points[1]);
surftool->add_vertex(points[2]);
surftool->add_vertex(points[0]);
surftool->add_vertex(points[2]);
surftool->add_vertex(points[3]);
}
}
surftool->set_material(mat);
surftool->commit(rotate_gizmo[i]);
}
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
// Scale
{
Ref<SurfaceTool> surftool = memnew(SurfaceTool);
surftool->begin(Mesh::PRIMITIVE_TRIANGLES);
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
// Cube arrow profile
const int arrow_points = 6;
Vector3 arrow[6] = {
nivec * 0.0 + ivec * 0.0,
nivec * 0.01 + ivec * 0.0,
nivec * 0.01 + ivec * 1.0 * GIZMO_SCALE_OFFSET,
nivec * 0.07 + ivec * 1.0 * GIZMO_SCALE_OFFSET,
nivec * 0.07 + ivec * 1.11 * GIZMO_SCALE_OFFSET,
nivec * 0.0 + ivec * 1.11 * GIZMO_SCALE_OFFSET,
};
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
int arrow_sides = 4;
for (int k = 0; k < 4; k++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
Basis ma(ivec, Math_PI * 2 * float(k) / arrow_sides);
Basis mb(ivec, Math_PI * 2 * float(k + 1) / arrow_sides);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
for (int j = 0; j < arrow_points - 1; j++) {
Vector3 points[4] = {
ma.xform(arrow[j]),
mb.xform(arrow[j]),
mb.xform(arrow[j + 1]),
ma.xform(arrow[j + 1]),
};
surftool->add_vertex(points[0]);
surftool->add_vertex(points[1]);
surftool->add_vertex(points[2]);
surftool->add_vertex(points[0]);
surftool->add_vertex(points[2]);
surftool->add_vertex(points[3]);
}
}
surftool->set_material(mat);
surftool->commit(scale_gizmo[i]);
}
Implemented planar scaling with two modes. Modes: - Scale uniformly on two axes - Hold SHIFT to scale non uniformly
2017-11-14 22:50:19 +00:00
// Plane Scale
{
Ref<SurfaceTool> surftool = memnew(SurfaceTool);
surftool->begin(Mesh::PRIMITIVE_TRIANGLES);
Vector3 vec = ivec2 - ivec3;
Vector3 plane[4] = {
vec * GIZMO_PLANE_DST,
vec * GIZMO_PLANE_DST + ivec2 * GIZMO_PLANE_SIZE,
vec * (GIZMO_PLANE_DST + GIZMO_PLANE_SIZE),
vec * GIZMO_PLANE_DST - ivec3 * GIZMO_PLANE_SIZE
};
Basis ma(ivec, Math_PI / 2);
Vector3 points[4] = {
ma.xform(plane[0]),
ma.xform(plane[1]),
ma.xform(plane[2]),
ma.xform(plane[3]),
};
surftool->add_vertex(points[0]);
surftool->add_vertex(points[1]);
surftool->add_vertex(points[2]);
surftool->add_vertex(points[0]);
surftool->add_vertex(points[2]);
surftool->add_vertex(points[3]);
Ref<SpatialMaterial> plane_mat = memnew(SpatialMaterial);
plane_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
plane_mat->set_on_top_of_alpha();
plane_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
plane_mat->set_cull_mode(SpatialMaterial::CULL_DISABLED);
Color col;
col[i] = 1.0;
col.a = gizmo_alph;
plane_mat->set_albedo(col);
plane_gizmo_color[i] = plane_mat; // needed, so we can draw planes from both sides
surftool->set_material(plane_mat);
surftool->commit(scale_plane_gizmo[i]);
}
Scale editing Gizmo for Spatial Editor Added support for axis locked scaling with handles, supports both world and local space. Local space recommended for most editing tasks. Also fixed some small bugs, polished Gizmo looks and cleaned up some dead code. Happy scaling! :)
2017-09-21 21:11:56 +00:00
}
}
_generate_selection_box();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void SpatialEditor::_finish_indicators() {
VisualServer::get_singleton()->free(origin_instance);
VisualServer::get_singleton()->free(origin);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
VisualServer::get_singleton()->free(grid_instance[i]);
VisualServer::get_singleton()->free(grid[i]);
}
//VisualServer::get_singleton()->free(poly);
//VisualServer::get_singleton()->free(indicators_instance);
//VisualServer::get_singleton()->free(indicators);
}
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
bool SpatialEditor::is_any_freelook_active() const {
for (unsigned int i = 0; i < VIEWPORTS_COUNT; ++i) {
if (viewports[i]->is_freelook_active())
return true;
}
return false;
}
ability to lock spatial nodes transform in editor
2017-10-23 19:21:15 +00:00
void SpatialEditor::_refresh_menu_icons() {
bool all_locked = true;
List<Node *> &selection = editor_selection->get_selected_node_list();
if (selection.empty()) {
all_locked = false;
} else {
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
if (Object::cast_to<Spatial>(E->get()) && !Object::cast_to<Spatial>(E->get())->has_meta("_edit_lock_")) {
all_locked = false;
break;
}
}
}
tool_button[TOOL_LOCK_SELECTED]->set_visible(!all_locked);
tool_button[TOOL_LOCK_SELECTED]->set_disabled(selection.empty());
tool_button[TOOL_UNLOCK_SELECTED]->set_visible(all_locked);
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
void SpatialEditor::_unhandled_key_input(Ref<InputEvent> p_event) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
New API for visibility in both CanvasItem and Spatial visible (property) - access set_visible(bool) is_visible() is_visible_in_tree() - true when visible and parents visible show() hide() - for convenience
2017-01-13 13:45:50 +00:00
if (!is_visible_in_tree() || get_viewport()->gui_has_modal_stack())
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return;
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Ref<InputEventKey> k = p_event;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (k.is_valid()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
// Note: need to check is_echo because first person movement keys might still be held
if (!is_any_freelook_active() && !p_event->is_echo()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (!k->is_pressed())
return;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (ED_IS_SHORTCUT("spatial_editor/tool_select", p_event))
_menu_item_pressed(MENU_TOOL_SELECT);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
else if (ED_IS_SHORTCUT("spatial_editor/tool_move", p_event))
_menu_item_pressed(MENU_TOOL_MOVE);
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
else if (ED_IS_SHORTCUT("spatial_editor/tool_rotate", p_event))
_menu_item_pressed(MENU_TOOL_ROTATE);
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
else if (ED_IS_SHORTCUT("spatial_editor/tool_scale", p_event))
_menu_item_pressed(MENU_TOOL_SCALE);
Moved Local Space Mode and Transform Snap settings to Top Bar ... ...buttons for easier access.
2017-11-18 18:51:37 +00:00
else if (ED_IS_SHORTCUT("spatial_editor/local_coords", p_event))
if (are_local_coords_enabled()) {
_menu_item_toggled(false, MENU_TOOL_LOCAL_COORDS);
} else {
_menu_item_toggled(true, MENU_TOOL_LOCAL_COORDS);
}
else if (ED_IS_SHORTCUT("spatial_editor/snap", p_event))
if (is_snap_enabled()) {
_menu_item_toggled(false, MENU_TOOL_USE_SNAP);
} else {
_menu_item_toggled(true, MENU_TOOL_USE_SNAP);
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
void SpatialEditor::_notification(int p_what) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_what == NOTIFICATION_READY) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
tool_button[SpatialEditor::TOOL_MODE_SELECT]->set_icon(get_icon("ToolSelect", "EditorIcons"));
tool_button[SpatialEditor::TOOL_MODE_MOVE]->set_icon(get_icon("ToolMove", "EditorIcons"));
tool_button[SpatialEditor::TOOL_MODE_ROTATE]->set_icon(get_icon("ToolRotate", "EditorIcons"));
tool_button[SpatialEditor::TOOL_MODE_SCALE]->set_icon(get_icon("ToolScale", "EditorIcons"));
tool_button[SpatialEditor::TOOL_MODE_LIST_SELECT]->set_icon(get_icon("ListSelect", "EditorIcons"));
ability to lock spatial nodes transform in editor
2017-10-23 19:21:15 +00:00
tool_button[SpatialEditor::TOOL_LOCK_SELECTED]->set_icon(get_icon("Lock", "EditorIcons"));
tool_button[SpatialEditor::TOOL_UNLOCK_SELECTED]->set_icon(get_icon("Unlock", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Moved Local Space Mode and Transform Snap settings to Top Bar ... ...buttons for easier access.
2017-11-18 18:51:37 +00:00
tool_option_button[SpatialEditor::TOOL_OPT_LOCAL_COORDS]->set_icon(get_icon("Object", "EditorIcons"));
tool_option_button[SpatialEditor::TOOL_OPT_USE_SNAP]->set_icon(get_icon("Snap", "EditorIcons"));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), get_icon("Panels1", "EditorIcons"));
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), get_icon("Panels2", "EditorIcons"));
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), get_icon("Panels2Alt", "EditorIcons"));
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), get_icon("Panels3", "EditorIcons"));
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), get_icon("Panels3Alt", "EditorIcons"));
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), get_icon("Panels4", "EditorIcons"));
Implemented skeleton visibility Removed code visibility code from popup menu
2017-11-22 21:29:27 +00:00
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VISIBILITY_SKELETON), view_menu->get_popup()->get_icon("visibility_visible"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
_menu_item_pressed(MENU_VIEW_USE_1_VIEWPORT);
ability to lock spatial nodes transform in editor
2017-10-23 19:21:15 +00:00
_refresh_menu_icons();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
get_tree()->connect("node_removed", this, "_node_removed");
ability to lock spatial nodes transform in editor
2017-10-23 19:21:15 +00:00
EditorNode::get_singleton()->get_scene_tree_dock()->get_tree_editor()->connect("node_changed", this, "_refresh_menu_icons");
editor_selection->connect("selection_changed", this, "_refresh_menu_icons");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_what == NOTIFICATION_ENTER_TREE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
gizmos = memnew(SpatialEditorGizmos);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
_init_indicators();
}
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_what == NOTIFICATION_EXIT_TREE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
_finish_indicators();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
memdelete(gizmos);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
added icon updating to most ui elements
2017-08-29 23:03:13 +00:00
if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {
tool_button[SpatialEditor::TOOL_MODE_SELECT]->set_icon(get_icon("ToolSelect", "EditorIcons"));
tool_button[SpatialEditor::TOOL_MODE_MOVE]->set_icon(get_icon("ToolMove", "EditorIcons"));
tool_button[SpatialEditor::TOOL_MODE_ROTATE]->set_icon(get_icon("ToolRotate", "EditorIcons"));
tool_button[SpatialEditor::TOOL_MODE_SCALE]->set_icon(get_icon("ToolScale", "EditorIcons"));
tool_button[SpatialEditor::TOOL_MODE_LIST_SELECT]->set_icon(get_icon("ListSelect", "EditorIcons"));
Moved Local Space Mode and Transform Snap settings to Top Bar ... ...buttons for easier access.
2017-11-18 18:51:37 +00:00
tool_option_button[SpatialEditor::TOOL_OPT_LOCAL_COORDS]->set_icon(get_icon("Object", "EditorIcons"));
tool_option_button[SpatialEditor::TOOL_OPT_USE_SNAP]->set_icon(get_icon("Snap", "EditorIcons"));
added icon updating to most ui elements
2017-08-29 23:03:13 +00:00
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), get_icon("Panels1", "EditorIcons"));
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), get_icon("Panels2", "EditorIcons"));
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), get_icon("Panels2Alt", "EditorIcons"));
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), get_icon("Panels3", "EditorIcons"));
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), get_icon("Panels3Alt", "EditorIcons"));
view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), get_icon("Panels4", "EditorIcons"));
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void SpatialEditor::add_control_to_menu_panel(Control *p_control) {
hbc_menu->add_child(p_control);
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditor::set_can_preview(Camera *p_preview) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 4; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
viewports[i]->set_can_preview(p_preview);
}
}
VSplitContainer *SpatialEditor::get_shader_split() {
return shader_split;
}
TileMap Fixes
2017-12-01 00:50:09 +00:00
HSplitContainer *SpatialEditor::get_palette_split() {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
TileMap Fixes
2017-12-01 00:50:09 +00:00
return palette_split;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditor::_request_gizmo(Object *p_obj) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
Spatial *sp = Object::cast_to<Spatial>(p_obj);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!sp)
return;
-Massive clean up to gizmos -Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
2017-08-26 03:40:45 +00:00
if (editor->get_edited_scene() && (sp == editor->get_edited_scene() || (sp->get_owner() && editor->get_edited_scene()->is_a_parent_of(sp)))) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 02:10:44 +00:00
Ref<SpatialEditorGizmo> seg;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < EditorNode::get_singleton()->get_editor_data().get_editor_plugin_count(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 02:10:44 +00:00
seg = EditorNode::get_singleton()->get_editor_data().get_editor_plugin(i)->create_spatial_gizmo(sp);
if (seg.is_valid())
break;
}
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Completed the support for plugins! It is not possible to add plugins. Not all APIs are provided yet, please request whathever you are missing. Some example plugins are provided in demos/plugins. Just copy them to a folder in your project named addons/ and then enable them from the project settings. Have fun!
2016-02-28 02:10:44 +00:00
if (!seg.is_valid()) {
seg = gizmos->get_gizmo(sp);
}
if (seg.is_valid()) {
sp->set_gizmo(seg);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (seg.is_valid() && sp == selected) {
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
seg->set_selected(true);
selected->update_gizmo();
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditor::_toggle_maximize_view(Object *p_viewport) {
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
if (!p_viewport) return;
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
SpatialEditorViewport *current_viewport = Object::cast_to<SpatialEditorViewport>(p_viewport);
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
if (!current_viewport) return;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
int index = -1;
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
bool maximized = false;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 4; i++) {
if (viewports[i] == current_viewport) {
index = i;
if (current_viewport->get_global_rect() == viewport_base->get_global_rect())
maximized = true;
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
break;
}
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (index == -1) return;
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
if (!maximized) {
Fix signed and unsigned comparisons The first in my quest to make Godot 3.x compile with -Werror on GCC7
2017-08-31 21:30:35 +00:00
for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
if (i == (uint32_t)index)
Remove set_area_as_parent_rect and replace it by set_anchors_and_margins_preset(PRESET_WIDE)
2017-09-21 22:12:33 +00:00
viewports[i]->set_anchors_and_margins_preset(Control::PRESET_WIDE);
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
else
viewports[i]->hide();
}
} else {
Fix signed and unsigned comparisons The first in my quest to make Godot 3.x compile with -Werror on GCC7
2017-08-31 21:30:35 +00:00
for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++)
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
viewports[i]->show();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT)))
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
_menu_item_pressed(MENU_VIEW_USE_1_VIEWPORT);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS)))
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
_menu_item_pressed(MENU_VIEW_USE_2_VIEWPORTS);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT)))
Misc Bits -=-=-=-=- -Added more missing icons to nodes. -Added more 3D split view modes -Fixed annoying script editor bug with keyboard focus
2014-10-09 03:06:51 +00:00
_menu_item_pressed(MENU_VIEW_USE_2_VIEWPORTS_ALT);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS)))
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
_menu_item_pressed(MENU_VIEW_USE_3_VIEWPORTS);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT)))
Misc Bits -=-=-=-=- -Added more missing icons to nodes. -Added more 3D split view modes -Fixed annoying script editor bug with keyboard focus
2014-10-09 03:06:51 +00:00
_menu_item_pressed(MENU_VIEW_USE_3_VIEWPORTS_ALT);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS)))
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
_menu_item_pressed(MENU_VIEW_USE_4_VIEWPORTS);
}
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditor::_node_removed(Node *p_node) {
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_node == selected)
selected = NULL;
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void SpatialEditor::_bind_methods() {
Style: Fix whole-line commented code They do not play well with clang-format which aligns the `//` part with the rest of the code block, thus producing badly indented commented code.
2017-01-14 11:26:56 +00:00
//ClassDB::bind_method("_gui_input",&SpatialEditor::_gui_input);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ClassDB::bind_method("_unhandled_key_input", &SpatialEditor::_unhandled_key_input);
ClassDB::bind_method("_node_removed", &SpatialEditor::_node_removed);
ClassDB::bind_method("_menu_item_pressed", &SpatialEditor::_menu_item_pressed);
Moved Local Space Mode and Transform Snap settings to Top Bar ... ...buttons for easier access.
2017-11-18 18:51:37 +00:00
ClassDB::bind_method("_menu_item_toggled", &SpatialEditor::_menu_item_toggled);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ClassDB::bind_method("_xform_dialog_action", &SpatialEditor::_xform_dialog_action);
ClassDB::bind_method("_get_editor_data", &SpatialEditor::_get_editor_data);
ClassDB::bind_method("_request_gizmo", &SpatialEditor::_request_gizmo);
ClassDB::bind_method("_toggle_maximize_view", &SpatialEditor::_toggle_maximize_view);
ability to lock spatial nodes transform in editor
2017-10-23 19:21:15 +00:00
ClassDB::bind_method("_refresh_menu_icons", &SpatialEditor::_refresh_menu_icons);
Space to toggle maximize viewport Cleanup debug output
2014-04-01 10:45:48 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ADD_SIGNAL(MethodInfo("transform_key_request"));
ability to lock spatial nodes transform in editor
2017-10-23 19:21:15 +00:00
ADD_SIGNAL(MethodInfo("item_lock_status_changed"));
Fixing Issues... - #672 (default user:// in $HOME/.godot/app_userdata (linux/osx) and $APPDATA/Godot/app_userdata (Windows) - #676 (draw both tiles and octants in order from top to bottom, left to right ) - #686 (unicode escape sequences work now) - #702 (was not a bug, but a test was added to see if bodies went too far away)
2014-09-19 21:39:50 +00:00
}
void SpatialEditor::clear() {
Tweak the default editor camera settings - The default FOV is now 70 - The default Z-near plane is now at 0.05 meters
2017-11-25 22:03:26 +00:00
settings_fov->set_value(EDITOR_DEF("editors/3d/default_fov", 70.0));
settings_znear->set_value(EDITOR_DEF("editors/3d/default_z_near", 0.05));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
settings_zfar->set_value(EDITOR_DEF("editors/3d/default_z_far", 1500.0));
Fixing Issues... - #672 (default user:// in $HOME/.godot/app_userdata (linux/osx) and $APPDATA/Godot/app_userdata (Windows) - #676 (draw both tiles and octants in order from top to bottom, left to right ) - #686 (unicode escape sequences work now) - #702 (was not a bug, but a test was added to see if bodies went too far away)
2014-09-19 21:39:50 +00:00
Fix signed and unsigned comparisons The first in my quest to make Godot 3.x compile with -Werror on GCC7
2017-08-31 21:30:35 +00:00
for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
Fixing Issues... - #672 (default user:// in $HOME/.godot/app_userdata (linux/osx) and $APPDATA/Godot/app_userdata (Windows) - #676 (draw both tiles and octants in order from top to bottom, left to right ) - #686 (unicode escape sequences work now) - #702 (was not a bug, but a test was added to see if bodies went too far away)
2014-09-19 21:39:50 +00:00
viewports[i]->reset();
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
VisualServer::get_singleton()->instance_set_visible(origin_instance, true);
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN), true);
for (int i = 0; i < 3; ++i) {
Fixing Issues... - #672 (default user:// in $HOME/.godot/app_userdata (linux/osx) and $APPDATA/Godot/app_userdata (Windows) - #676 (draw both tiles and octants in order from top to bottom, left to right ) - #686 (unicode escape sequences work now) - #702 (was not a bug, but a test was added to see if bodies went too far away)
2014-09-19 21:39:50 +00:00
if (grid_enable[i]) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
VisualServer::get_singleton()->instance_set_visible(grid_instance[i], true);
grid_visible[i] = true;
Fixing Issues... - #672 (default user:// in $HOME/.godot/app_userdata (linux/osx) and $APPDATA/Godot/app_userdata (Windows) - #676 (draw both tiles and octants in order from top to bottom, left to right ) - #686 (unicode escape sequences work now) - #702 (was not a bug, but a test was added to see if bodies went too far away)
2014-09-19 21:39:50 +00:00
}
}
Fix signed and unsigned comparisons The first in my quest to make Godot 3.x compile with -Werror on GCC7
2017-08-31 21:30:35 +00:00
for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
viewports[i]->view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(SpatialEditorViewport::VIEW_AUDIO_LISTENER), i == 0);
viewports[i]->viewport->set_as_audio_listener(i == 0);
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
}
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_GRID), true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
SpatialEditor::SpatialEditor(EditorNode *p_editor) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
gizmo.visible = true;
gizmo.scale = 1.0;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
viewport_environment = Ref<Environment>(memnew(Environment));
undo_redo = p_editor->get_undo_redo();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
VBoxContainer *vbc = this;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
custom_camera = NULL;
singleton = this;
editor = p_editor;
editor_selection = editor->get_editor_selection();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
editor_selection->add_editor_plugin(this);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
snap_enabled = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
tool_mode = TOOL_MODE_SELECT;
//set_focus_mode(FOCUS_ALL);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
hbc_menu = memnew(HBoxContainer);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
vbc->add_child(hbc_menu);
Vector<Variant> button_binds;
button_binds.resize(1);
Moved Local Space Mode and Transform Snap settings to Top Bar ... ...buttons for easier access.
2017-11-18 18:51:37 +00:00
String sct;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
tool_button[TOOL_MODE_SELECT] = memnew(ToolButton);
hbc_menu->add_child(tool_button[TOOL_MODE_SELECT]);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
tool_button[TOOL_MODE_SELECT]->set_toggle_mode(true);
tool_button[TOOL_MODE_SELECT]->set_flat(true);
tool_button[TOOL_MODE_SELECT]->set_pressed(true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
button_binds[0] = MENU_TOOL_SELECT;
tool_button[TOOL_MODE_SELECT]->connect("pressed", this, "_menu_item_pressed", button_binds);
Editor: Add some more translatable strings.
2017-08-23 20:25:14 +00:00
tool_button[TOOL_MODE_SELECT]->set_tooltip(TTR("Select Mode (Q)\n") + keycode_get_string(KEY_MASK_CMD) + TTR("Drag: Rotate\nAlt+Drag: Move\nAlt+RMB: Depth list selection"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
tool_button[TOOL_MODE_MOVE] = memnew(ToolButton);
hbc_menu->add_child(tool_button[TOOL_MODE_MOVE]);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
tool_button[TOOL_MODE_MOVE]->set_toggle_mode(true);
tool_button[TOOL_MODE_MOVE]->set_flat(true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
button_binds[0] = MENU_TOOL_MOVE;
tool_button[TOOL_MODE_MOVE]->connect("pressed", this, "_menu_item_pressed", button_binds);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
tool_button[TOOL_MODE_MOVE]->set_tooltip(TTR("Move Mode (W)"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
tool_button[TOOL_MODE_ROTATE] = memnew(ToolButton);
hbc_menu->add_child(tool_button[TOOL_MODE_ROTATE]);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
tool_button[TOOL_MODE_ROTATE]->set_toggle_mode(true);
tool_button[TOOL_MODE_ROTATE]->set_flat(true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
button_binds[0] = MENU_TOOL_ROTATE;
tool_button[TOOL_MODE_ROTATE]->connect("pressed", this, "_menu_item_pressed", button_binds);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
tool_button[TOOL_MODE_ROTATE]->set_tooltip(TTR("Rotate Mode (E)"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
tool_button[TOOL_MODE_SCALE] = memnew(ToolButton);
hbc_menu->add_child(tool_button[TOOL_MODE_SCALE]);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
tool_button[TOOL_MODE_SCALE]->set_toggle_mode(true);
tool_button[TOOL_MODE_SCALE]->set_flat(true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
button_binds[0] = MENU_TOOL_SCALE;
tool_button[TOOL_MODE_SCALE]->connect("pressed", this, "_menu_item_pressed", button_binds);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
tool_button[TOOL_MODE_SCALE]->set_tooltip(TTR("Scale Mode (R)"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
tool_button[TOOL_MODE_LIST_SELECT] = memnew(ToolButton);
hbc_menu->add_child(tool_button[TOOL_MODE_LIST_SELECT]);
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
tool_button[TOOL_MODE_LIST_SELECT]->set_toggle_mode(true);
tool_button[TOOL_MODE_LIST_SELECT]->set_flat(true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
button_binds[0] = MENU_TOOL_LIST_SELECT;
tool_button[TOOL_MODE_LIST_SELECT]->connect("pressed", this, "_menu_item_pressed", button_binds);
Added 3 more translatable strings and fixed russian localization based on user feedback. Added strings already contained in the current version of the localization.
2016-06-01 11:32:20 +00:00
tool_button[TOOL_MODE_LIST_SELECT]->set_tooltip(TTR("Show a list of all objects at the position clicked\n(same as Alt+RMB in select mode)."));
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
ability to lock spatial nodes transform in editor
2017-10-23 19:21:15 +00:00
tool_button[TOOL_LOCK_SELECTED] = memnew(ToolButton);
hbc_menu->add_child(tool_button[TOOL_LOCK_SELECTED]);
button_binds[0] = MENU_LOCK_SELECTED;
tool_button[TOOL_LOCK_SELECTED]->connect("pressed", this, "_menu_item_pressed", button_binds);
tool_button[TOOL_LOCK_SELECTED]->set_tooltip(TTR("Lock the selected object in place (can't be moved)."));
tool_button[TOOL_UNLOCK_SELECTED] = memnew(ToolButton);
hbc_menu->add_child(tool_button[TOOL_UNLOCK_SELECTED]);
button_binds[0] = MENU_UNLOCK_SELECTED;
tool_button[TOOL_UNLOCK_SELECTED]->connect("pressed", this, "_menu_item_pressed", button_binds);
tool_button[TOOL_UNLOCK_SELECTED]->set_tooltip(TTR("Unlock the selected object (can be moved)."));
Moved Local Space Mode and Transform Snap settings to Top Bar ... ...buttons for easier access.
2017-11-18 18:51:37 +00:00
VSeparator *vs = memnew(VSeparator);
hbc_menu->add_child(vs);
tool_option_button[TOOL_OPT_LOCAL_COORDS] = memnew(ToolButton);
hbc_menu->add_child(tool_option_button[TOOL_OPT_LOCAL_COORDS]);
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_toggle_mode(true);
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_flat(true);
button_binds[0] = MENU_TOOL_LOCAL_COORDS;
tool_option_button[TOOL_OPT_LOCAL_COORDS]->connect("toggled", this, "_menu_item_toggled", button_binds);
ED_SHORTCUT("spatial_editor/local_coords", TTR("Local Coords"), KEY_T);
sct = ED_GET_SHORTCUT("spatial_editor/local_coords").ptr()->get_as_text();
tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_tooltip(vformat(TTR("Local Space Mode (%s)"), sct));
tool_option_button[TOOL_OPT_USE_SNAP] = memnew(ToolButton);
hbc_menu->add_child(tool_option_button[TOOL_OPT_USE_SNAP]);
tool_option_button[TOOL_OPT_USE_SNAP]->set_toggle_mode(true);
tool_option_button[TOOL_OPT_USE_SNAP]->set_flat(true);
button_binds[0] = MENU_TOOL_USE_SNAP;
tool_option_button[TOOL_OPT_USE_SNAP]->connect("toggled", this, "_menu_item_toggled", button_binds);
ED_SHORTCUT("spatial_editor/snap", TTR("Snap"), KEY_Y);
sct = ED_GET_SHORTCUT("spatial_editor/snap").ptr()->get_as_text();
tool_option_button[TOOL_OPT_USE_SNAP]->set_tooltip(vformat(TTR("Snap Mode (%s)"), sct));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
vs = memnew(VSeparator);
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
hbc_menu->add_child(vs);
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
// Drag and drop support;
preview_node = memnew(Spatial);
Rename Rect3 to AABB. Fixes #12973.
2017-11-17 02:09:00 +00:00
preview_bounds = AABB();
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ED_SHORTCUT("spatial_editor/bottom_view", TTR("Bottom View"), KEY_MASK_ALT + KEY_KP_7);
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
ED_SHORTCUT("spatial_editor/top_view", TTR("Top View"), KEY_KP_7);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ED_SHORTCUT("spatial_editor/rear_view", TTR("Rear View"), KEY_MASK_ALT + KEY_KP_1);
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
ED_SHORTCUT("spatial_editor/front_view", TTR("Front View"), KEY_KP_1);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ED_SHORTCUT("spatial_editor/left_view", TTR("Left View"), KEY_MASK_ALT + KEY_KP_3);
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
ED_SHORTCUT("spatial_editor/right_view", TTR("Right View"), KEY_KP_3);
ED_SHORTCUT("spatial_editor/switch_perspective_orthogonal", TTR("Switch Perspective/Orthogonal view"), KEY_KP_5);
ED_SHORTCUT("spatial_editor/insert_anim_key", TTR("Insert Animation Key"), KEY_K);
Add shortcut to reset cursor position in 3D Editor ( #166 ) The shortcut will focus the origin after you moved around with shift + mouse3. The default shortcut is the letter "O", like "F" for focus. This can be customized in the editor shortcuts menu. Closes #166
2016-10-04 18:39:38 +00:00
ED_SHORTCUT("spatial_editor/focus_origin", TTR("Focus Origin"), KEY_O);
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
ED_SHORTCUT("spatial_editor/focus_selection", TTR("Focus Selection"), KEY_F);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ED_SHORTCUT("spatial_editor/align_selection_with_view", TTR("Align Selection With View"), KEY_MASK_ALT + KEY_MASK_CMD + KEY_F);
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
Improved freelook - Fix movement input affecting all viewports even when clicking outside - Freelook up movement is now relative - Prevent tool shortcut conflict when moving - De-hardcode tool shortcuts (select, move, rotate, scale, wireframe) - Movement speed depends on zoom distance (like panning) - Mouse wheel controls speed (Blender-style) due to above point - Added zoom distance indicator, hides after short delay
2017-05-07 20:59:05 +00:00
ED_SHORTCUT("spatial_editor/tool_select", TTR("Tool Select"), KEY_Q);
ED_SHORTCUT("spatial_editor/tool_move", TTR("Tool Move"), KEY_W);
ED_SHORTCUT("spatial_editor/tool_rotate", TTR("Tool Rotate"), KEY_E);
ED_SHORTCUT("spatial_editor/tool_scale", TTR("Tool Scale"), KEY_R);
ED_SHORTCUT("spatial_editor/display_wireframe", TTR("Display Wireframe"), KEY_Z);
Add option to use freelook with a toggle shortcut (like Blender) instead of holding RMB (like Unity)
2017-10-30 00:22:48 +00:00
ED_SHORTCUT("spatial_editor/freelook_toggle", TTR("Toggle Freelook"), KEY_MASK_SHIFT + KEY_F);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
PopupMenu *p;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
transform_menu = memnew(MenuButton);
Added more translatable strings in code. Updated template tools.pot. also improved Russian localization.
2016-05-30 18:47:53 +00:00
transform_menu->set_text(TTR("Transform"));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
hbc_menu->add_child(transform_menu);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
p = transform_menu->get_popup();
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
p->add_shortcut(ED_SHORTCUT("spatial_editor/configure_snap", TTR("Configure Snap..")), MENU_TRANSFORM_CONFIGURE_SNAP);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
p->add_separator();
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
p->add_shortcut(ED_SHORTCUT("spatial_editor/transform_dialog", TTR("Transform Dialog..")), MENU_TRANSFORM_DIALOG);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
p->connect("id_pressed", this, "_menu_item_pressed");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
view_menu = memnew(MenuButton);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
view_menu->set_text(TTR("View"));
Rename [gs]et_pos to [gs]et_position for Controls Control set_pos -> set_position Control set_global_pos -> set_global_position [gs]et_mouse_pos -> [gs]et_mouse_position [gs]et_global_mouse_pos -> [gs]et_global_mouse_position fixes #8005
2017-03-29 15:29:38 +00:00
view_menu->set_position(Point2(212, 0));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
hbc_menu->add_child(view_menu);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
p = view_menu->get_popup();
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
accept = memnew(AcceptDialog);
editor->get_gui_base()->add_child(accept);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
p->add_check_shortcut(ED_SHORTCUT("spatial_editor/1_viewport", TTR("1 Viewport"), KEY_MASK_CMD + KEY_1), MENU_VIEW_USE_1_VIEWPORT);
p->add_check_shortcut(ED_SHORTCUT("spatial_editor/2_viewports", TTR("2 Viewports"), KEY_MASK_CMD + KEY_2), MENU_VIEW_USE_2_VIEWPORTS);
p->add_check_shortcut(ED_SHORTCUT("spatial_editor/2_viewports_alt", TTR("2 Viewports (Alt)"), KEY_MASK_ALT + KEY_MASK_CMD + KEY_2), MENU_VIEW_USE_2_VIEWPORTS_ALT);
p->add_check_shortcut(ED_SHORTCUT("spatial_editor/3_viewports", TTR("3 Viewports"), KEY_MASK_CMD + KEY_3), MENU_VIEW_USE_3_VIEWPORTS);
p->add_check_shortcut(ED_SHORTCUT("spatial_editor/3_viewports_alt", TTR("3 Viewports (Alt)"), KEY_MASK_ALT + KEY_MASK_CMD + KEY_3), MENU_VIEW_USE_3_VIEWPORTS_ALT);
p->add_check_shortcut(ED_SHORTCUT("spatial_editor/4_viewports", TTR("4 Viewports"), KEY_MASK_CMD + KEY_4), MENU_VIEW_USE_4_VIEWPORTS);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
p->add_separator();
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
p->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_origin", TTR("View Origin")), MENU_VIEW_ORIGIN);
p->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_grid", TTR("View Grid")), MENU_VIEW_GRID);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
p->add_separator();
Added spatial editor shortcuts for now it does not support the emulate numpad setting
2016-06-30 20:54:34 +00:00
p->add_shortcut(ED_SHORTCUT("spatial_editor/settings", TTR("Settings")), MENU_VIEW_CAMERA_SETTINGS);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Implemented skeleton visibility Removed code visibility code from popup menu
2017-11-22 21:29:27 +00:00
p->add_separator();
Change statable to multistate, remove extra separator
2017-12-12 02:37:37 +00:00
p->add_multistate_item(TTR("Skeleton Gizmo visibility"), 3, 1, MENU_VISIBILITY_SKELETON);
Implemented skeleton visibility Removed code visibility code from popup menu
2017-11-22 21:29:27 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
p->set_item_checked(p->get_item_index(MENU_VIEW_ORIGIN), true);
p->set_item_checked(p->get_item_index(MENU_VIEW_GRID), true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
p->connect("id_pressed", this, "_menu_item_pressed");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/* REST OF MENU */
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
palette_split = memnew(HSplitContainer);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
palette_split->set_v_size_flags(SIZE_EXPAND_FILL);
vbc->add_child(palette_split);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
shader_split = memnew(VSplitContainer);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
shader_split->set_h_size_flags(SIZE_EXPAND_FILL);
palette_split->add_child(shader_split);
Multiple 3D viewports are not operational.
2017-06-11 14:29:27 +00:00
viewport_base = memnew(SpatialEditorViewportContainer);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
shader_split->add_child(viewport_base);
viewport_base->set_v_size_flags(SIZE_EXPAND_FILL);
Fix signed and unsigned comparisons The first in my quest to make Godot 3.x compile with -Werror on GCC7
2017-08-31 21:30:35 +00:00
for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
viewports[i] = memnew(SpatialEditorViewport(this, editor, i));
viewports[i]->connect("toggle_maximize_view", this, "_toggle_maximize_view");
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
viewports[i]->assign_pending_data_pointers(preview_node, &preview_bounds, accept);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
viewport_base->add_child(viewports[i]);
}
//vbc->add_child(viewport_base);
/* SNAP DIALOG */
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
snap_dialog = memnew(ConfirmationDialog);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
snap_dialog->set_title(TTR("Snap Settings"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(snap_dialog);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
VBoxContainer *snap_dialog_vbc = memnew(VBoxContainer);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
snap_dialog->add_child(snap_dialog_vbc);
Removed the set_child_rect() in AcceptDialog. AcceptDialog now works as a container!
2017-01-10 04:49:55 +00:00
//snap_dialog->set_child_rect(snap_dialog_vbc);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
snap_translate = memnew(LineEdit);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
snap_translate->set_text("1");
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
snap_dialog_vbc->add_margin_child(TTR("Translate Snap:"), snap_translate);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
snap_rotate = memnew(LineEdit);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
snap_rotate->set_text("5");
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
snap_dialog_vbc->add_margin_child(TTR("Rotate Snap (deg.):"), snap_rotate);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
snap_scale = memnew(LineEdit);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
snap_scale->set_text("5");
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
snap_dialog_vbc->add_margin_child(TTR("Scale Snap (%):"), snap_scale);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
/* SETTINGS DIALOG */
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
settings_dialog = memnew(ConfirmationDialog);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
settings_dialog->set_title(TTR("Viewport Settings"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(settings_dialog);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
settings_vbc = memnew(VBoxContainer);
SpatialEditor: uniform min/max of fov,znear,zfar Clamp FOV to [0.01, 179], Znear and Zfar to [0.01, 10000]
2017-08-04 11:23:10 +00:00
settings_vbc->set_custom_minimum_size(Size2(200, 0) * EDSCALE);
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
settings_dialog->add_child(settings_vbc);
Removed the set_child_rect() in AcceptDialog. AcceptDialog now works as a container!
2017-01-10 04:49:55 +00:00
//settings_dialog->set_child_rect(settings_vbc);
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
settings_fov = memnew(SpinBox);
SpatialEditor: uniform min/max of fov,znear,zfar Clamp FOV to [0.01, 179], Znear and Zfar to [0.01, 10000]
2017-08-04 11:23:10 +00:00
settings_fov->set_max(MAX_FOV);
settings_fov->set_min(MIN_FOV);
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
settings_fov->set_step(0.01);
Tweak the default editor camera settings - The default FOV is now 70 - The default Z-near plane is now at 0.05 meters
2017-11-25 22:03:26 +00:00
settings_fov->set_value(EDITOR_DEF("editors/3d/default_fov", 70.0));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
settings_vbc->add_margin_child(TTR("Perspective FOV (deg.):"), settings_fov);
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
settings_znear = memnew(SpinBox);
SpatialEditor: uniform min/max of fov,znear,zfar Clamp FOV to [0.01, 179], Znear and Zfar to [0.01, 10000]
2017-08-04 11:23:10 +00:00
settings_znear->set_max(MAX_Z);
settings_znear->set_min(MIN_Z);
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
settings_znear->set_step(0.01);
Tweak the default editor camera settings - The default FOV is now 70 - The default Z-near plane is now at 0.05 meters
2017-11-25 22:03:26 +00:00
settings_znear->set_value(EDITOR_DEF("editors/3d/default_z_near", 0.05));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
settings_vbc->add_margin_child(TTR("View Z-Near:"), settings_znear);
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
settings_zfar = memnew(SpinBox);
SpatialEditor: uniform min/max of fov,znear,zfar Clamp FOV to [0.01, 179], Znear and Zfar to [0.01, 10000]
2017-08-04 11:23:10 +00:00
settings_zfar->set_max(MAX_Z);
settings_zfar->set_min(MIN_Z);
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
settings_zfar->set_step(0.01);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
settings_zfar->set_value(EDITOR_DEF("editors/3d/default_z_far", 1500));
settings_vbc->add_margin_child(TTR("View Z-Far:"), settings_zfar);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//settings_dialog->get_cancel()->hide();
/* XFORM DIALOG */
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
xform_dialog = memnew(ConfirmationDialog);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
xform_dialog->set_title(TTR("Transform Change"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(xform_dialog);
SpatialEditor: fix transform dialog
2017-07-31 13:00:02 +00:00
VBoxContainer *xform_vbc = memnew(VBoxContainer);
xform_dialog->add_child(xform_vbc);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
Label *l = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
l->set_text(TTR("Translate:"));
SpatialEditor: fix transform dialog
2017-07-31 13:00:02 +00:00
xform_vbc->add_child(l);
HBoxContainer *xform_hbc = memnew(HBoxContainer);
xform_vbc->add_child(xform_hbc);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
xform_translate[i] = memnew(LineEdit);
SpatialEditor: fix transform dialog
2017-07-31 13:00:02 +00:00
xform_translate[i]->set_h_size_flags(SIZE_EXPAND_FILL);
xform_hbc->add_child(xform_translate[i]);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
l = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
l->set_text(TTR("Rotate (deg.):"));
SpatialEditor: fix transform dialog
2017-07-31 13:00:02 +00:00
xform_vbc->add_child(l);
xform_hbc = memnew(HBoxContainer);
xform_vbc->add_child(xform_hbc);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
xform_rotate[i] = memnew(LineEdit);
SpatialEditor: fix transform dialog
2017-07-31 13:00:02 +00:00
xform_rotate[i]->set_h_size_flags(SIZE_EXPAND_FILL);
xform_hbc->add_child(xform_rotate[i]);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
l = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
l->set_text(TTR("Scale (ratio):"));
SpatialEditor: fix transform dialog
2017-07-31 13:00:02 +00:00
xform_vbc->add_child(l);
xform_hbc = memnew(HBoxContainer);
xform_vbc->add_child(xform_hbc);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < 3; i++) {
xform_scale[i] = memnew(LineEdit);
SpatialEditor: fix transform dialog
2017-07-31 13:00:02 +00:00
xform_scale[i]->set_h_size_flags(SIZE_EXPAND_FILL);
xform_hbc->add_child(xform_scale[i]);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
l = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
l->set_text(TTR("Transform Type"));
SpatialEditor: fix transform dialog
2017-07-31 13:00:02 +00:00
xform_vbc->add_child(l);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
xform_type = memnew(OptionButton);
SpatialEditor: fix transform dialog
2017-07-31 13:00:02 +00:00
xform_type->set_h_size_flags(SIZE_EXPAND_FILL);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
xform_type->add_item(TTR("Pre"));
xform_type->add_item(TTR("Post"));
SpatialEditor: fix transform dialog
2017-07-31 13:00:02 +00:00
xform_vbc->add_child(xform_type);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
xform_dialog->connect("confirmed", this, "_xform_dialog_action");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
scenario_debug = VisualServer::SCENARIO_DEBUG_DISABLED;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
selected = NULL;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
-Fixed a few bugs in Viewport -Made a few demos using Viewport to show it's true power! -Fixed some start-up error messages.
2014-04-10 03:18:27 +00:00
set_process_unhandled_key_input(true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_to_group("_spatial_editor_group");
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
EDITOR_DEF("editors/3d/manipulator_gizmo_size", 80);
EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "editors/3d/manipulator_gizmo_size", PROPERTY_HINT_RANGE, "16,1024,1"));
EDITOR_DEF("editors/3d/manipulator_gizmo_opacity", 0.2);
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
over_gizmo_handle = -1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
SpatialEditor::~SpatialEditor() {
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
memdelete(preview_node);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void SpatialEditorPlugin::make_visible(bool p_visible) {
if (p_visible) {
remove trailing whitespace
2016-03-08 23:00:52 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
spatial_editor->show();
spatial_editor->set_process(true);
//VisualServer::get_singleton()->viewport_set_hide_scenario(editor->get_scene_root()->get_viewport(),false);
spatial_editor->grab_focus();
} else {
remove trailing whitespace
2016-03-08 23:00:52 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
spatial_editor->hide();
spatial_editor->set_process(false);
//VisualServer::get_singleton()->viewport_set_hide_scenario(editor->get_scene_root()->get_viewport(),true);
}
}
void SpatialEditorPlugin::edit(Object *p_object) {
Lots of 3D improvements: -Object Manipulator Gizmo keeps proper scale in all windows and projections, (configurable on settings too). -Manipulator gizmos for other objects (camera, shapes, etc) massively improved and bug-fixed. -Manipulator gizmos are different for edited object and other objects. -Properly highlight manipulator gizmo handles when hovered. -Fixed bugs in fragment program when using more than 1 light together. -Reload png/jpg files automatically in editor if edited externally. -Added 4-stages Parallel Split Shadow Mapping, to improve shadow quality in large scenarios -Added PCF13 to improve smoothness of shadow borders -General optimization of directional light shadow mapping for Orthogonal,PSM and PSSM. -Fixed normal mapping when importing DAE files, works nicely now.
2014-05-05 01:50:23 +00:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
spatial_editor->edit(Object::cast_to<Spatial>(p_object));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
bool SpatialEditorPlugin::handles(Object *p_object) const {
remove trailing whitespace
2016-03-08 23:00:52 +00:00
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant. All usages of "type" to refer to classes were renamed to "class" ClassDB has been exposed to GDScript. OBJ_TYPE() macro is now GDCLASS()
2017-01-03 02:03:46 +00:00
return p_object->is_class("Spatial");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Dictionary SpatialEditorPlugin::get_state() const {
return spatial_editor->get_state();
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditorPlugin::set_state(const Dictionary &p_state) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
spatial_editor->set_state(p_state);
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditor::snap_cursor_to_plane(const Plane &p_plane) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Style: Fix whole-line commented code They do not play well with clang-format which aligns the `//` part with the rest of the code block, thus producing badly indented commented code.
2017-01-14 11:26:56 +00:00
//cursor.pos=p_plane.project(cursor.pos);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Added snapping to spatial drag and drop.
2017-09-18 21:44:04 +00:00
Vector3 SpatialEditor::snap_point(Vector3 p_target, Vector3 p_start) const {
if (is_snap_enabled()) {
p_target.x = Math::snap_scalar(0.0, get_translate_snap(), p_target.x);
p_target.y = Math::snap_scalar(0.0, get_translate_snap(), p_target.y);
p_target.z = Math::snap_scalar(0.0, get_translate_snap(), p_target.z);
}
return p_target;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void SpatialEditorPlugin::_bind_methods() {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ClassDB::bind_method("snap_cursor_to_plane", &SpatialEditorPlugin::snap_cursor_to_plane);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
void SpatialEditorPlugin::snap_cursor_to_plane(const Plane &p_plane) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
spatial_editor->snap_cursor_to_plane(p_plane);
}
SpatialEditorPlugin::SpatialEditorPlugin(EditorNode *p_node) {
remove trailing whitespace
2016-03-08 23:00:52 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
editor = p_node;
spatial_editor = memnew(SpatialEditor(p_node));
-Property apply limits to V/H Splits in main editor window. Fixes #3567
2016-02-08 16:01:54 +00:00
spatial_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
editor->get_viewport()->add_child(spatial_editor);
-Property apply limits to V/H Splits in main editor window. Fixes #3567
2016-02-08 16:01:54 +00:00
Remove set_area_as_parent_rect and replace it by set_anchors_and_margins_preset(PRESET_WIDE)
2017-09-21 22:12:33 +00:00
//spatial_editor->set_anchors_and_margins_preset(Control::PRESET_WIDE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
spatial_editor->hide();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
spatial_editor->connect("transform_key_request", editor, "_transform_keyed");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//spatial_editor->set_process(true);
}
SpatialEditorPlugin::~SpatialEditorPlugin() {
}