Make secondary handle 50% transparent in Path editor to distinguish from

main handle; Add close curve icon in Path editor UI; Fixed mixed EOL

1 files changed, 35 insertions, 29 deletions

diff --git a/tools/editor/spatial_editor_gizmos.cpp b/tools/editor/spatial_editor_gizmos.cpp
index 8ec291406..b62ac00e7 100644
--- a/tools/editor/spatial_editor_gizmos.cpp
+++ b/tools/editor/spatial_editor_gizmos.cpp
@@ -1,31 +1,31 @@
-/*************************************************************************/
-/*  spatial_editor_gizmos.cpp                                            */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                    http://www.godotengine.org                         */
-/*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
+/*************************************************************************/

+/*  spatial_editor_gizmos.cpp                                            */

+/*************************************************************************/

+/*                       This file is part of:                           */

+/*                           GODOT ENGINE                                */

+/*                    http://www.godotengine.org                         */

+/*************************************************************************/

+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */

+/*                                                                       */

+/* 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_gizmos.h"

 #include "geometry.h"

 #include "scene/3d/camera.h"

@@ -191,7 +191,10 @@ void SpatialGizmoTool::add_handles(const Vector<Vector3> &p_handles, bool p_bill
 	a.resize(VS::ARRAY_MAX);

 	a[VS::ARRAY_VERTEX]=p_handles;

 	mesh->add_surface(Mesh::PRIMITIVE_POINTS,a);

-	mesh->surface_set_material(0,SpatialEditorGizmos::singleton->handle2_material);

+	if (!p_secondary)

+		mesh->surface_set_material(0,SpatialEditorGizmos::singleton->handle2_material);

+	else

+		mesh->surface_set_material(0,SpatialEditorGizmos::singleton->handle2_secondary_material);

 

 

 #else

@@ -2131,6 +2134,9 @@ SpatialEditorGizmos::SpatialEditorGizmos() {
 	handle2_material->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1));

 	handle2_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);

 

+	handle2_secondary_material = handle2_material->duplicate();

+	handle2_secondary_material->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,.5));

+

 	light_material = Ref<FixedMaterial>( memnew( FixedMaterial ));

 	light_material->set_flag(Material::FLAG_UNSHADED, true);

 	light_material->set_line_width(3.0);