Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
825a89d0
Unverified
Commit
825a89d0
authored
May 09, 2020
by
Rémi Verschelde
Committed by
GitHub
May 09, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #38589 from MCrafterzz/line
Rename Lineshape's d to distance
parents
1c6b1838
9a7e515d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
23 deletions
+23
-23
LineShape2D.xml
doc/classes/LineShape2D.xml
+1
-1
collision_shape_2d_editor_plugin.cpp
editor/plugins/collision_shape_2d_editor_plugin.cpp
+6
-6
line_shape_2d.cpp
scene/resources/line_shape_2d.cpp
+13
-13
line_shape_2d.h
scene/resources/line_shape_2d.h
+3
-3
No files found.
doc/classes/LineShape2D.xml
View file @
825a89d0
...
...
@@ -11,7 +11,7 @@
<methods>
</methods>
<members>
<member
name=
"d
"
type=
"float"
setter=
"set_d"
getter=
"get_d
"
default=
"0.0"
>
<member
name=
"d
istance"
type=
"float"
setter=
"set_distance"
getter=
"get_distance
"
default=
"0.0"
>
The line's distance from the origin.
</member>
<member
name=
"normal"
type=
"Vector2"
setter=
"set_normal"
getter=
"get_normal"
default=
"Vector2( 0, 1 )"
>
...
...
editor/plugins/collision_shape_2d_editor_plugin.cpp
View file @
825a89d0
...
...
@@ -81,7 +81,7 @@ Variant CollisionShape2DEditor::get_handle_value(int idx) const {
Ref
<
LineShape2D
>
line
=
node
->
get_shape
();
if
(
idx
==
0
)
{
return
line
->
get_d
();
return
line
->
get_d
istance
();
}
else
{
return
line
->
get_normal
();
}
...
...
@@ -162,7 +162,7 @@ void CollisionShape2DEditor::set_handle(int idx, Point2 &p_point) {
Ref
<
LineShape2D
>
line
=
node
->
get_shape
();
if
(
idx
==
0
)
{
line
->
set_d
(
p_point
.
length
());
line
->
set_d
istance
(
p_point
.
length
());
}
else
{
line
->
set_normal
(
p_point
.
normalized
());
}
...
...
@@ -260,9 +260,9 @@ void CollisionShape2DEditor::commit_handle(int idx, Variant &p_org) {
Ref
<
LineShape2D
>
line
=
node
->
get_shape
();
if
(
idx
==
0
)
{
undo_redo
->
add_do_method
(
line
.
ptr
(),
"set_d
"
,
line
->
get_d
());
undo_redo
->
add_do_method
(
line
.
ptr
(),
"set_d
istance"
,
line
->
get_distance
());
undo_redo
->
add_do_method
(
canvas_item_editor
,
"update_viewport"
);
undo_redo
->
add_undo_method
(
line
.
ptr
(),
"set_d"
,
p_org
);
undo_redo
->
add_undo_method
(
line
.
ptr
(),
"set_d
istance
"
,
p_org
);
undo_redo
->
add_undo_method
(
canvas_item_editor
,
"update_viewport"
);
}
else
{
undo_redo
->
add_do_method
(
line
.
ptr
(),
"set_normal"
,
line
->
get_normal
());
...
...
@@ -485,8 +485,8 @@ void CollisionShape2DEditor::forward_canvas_draw_over_viewport(Control *p_overla
Ref
<
LineShape2D
>
shape
=
node
->
get_shape
();
handles
.
resize
(
2
);
handles
.
write
[
0
]
=
shape
->
get_normal
()
*
shape
->
get_d
();
handles
.
write
[
1
]
=
shape
->
get_normal
()
*
(
shape
->
get_d
()
+
30.0
);
handles
.
write
[
0
]
=
shape
->
get_normal
()
*
shape
->
get_d
istance
();
handles
.
write
[
1
]
=
shape
->
get_normal
()
*
(
shape
->
get_d
istance
()
+
30.0
);
p_overlay
->
draw_texture
(
h
,
gt
.
xform
(
handles
[
0
])
-
size
);
p_overlay
->
draw_texture
(
h
,
gt
.
xform
(
handles
[
1
])
-
size
);
...
...
scene/resources/line_shape_2d.cpp
View file @
825a89d0
...
...
@@ -35,7 +35,7 @@
bool
LineShape2D
::
_edit_is_selected_on_click
(
const
Point2
&
p_point
,
double
p_tolerance
)
const
{
Vector2
point
=
get_d
()
*
get_normal
();
Vector2
point
=
get_d
istance
()
*
get_normal
();
Vector2
l
[
2
][
2
]
=
{
{
point
-
get_normal
().
tangent
()
*
100
,
point
+
get_normal
().
tangent
()
*
100
},
{
point
,
point
+
get_normal
()
*
30
}
};
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
...
...
@@ -51,7 +51,7 @@ void LineShape2D::_update_shape() {
Array
arr
;
arr
.
push_back
(
normal
);
arr
.
push_back
(
d
);
arr
.
push_back
(
d
istance
);
PhysicsServer2D
::
get_singleton
()
->
shape_set_data
(
get_rid
(),
arr
);
emit_changed
();
}
...
...
@@ -62,9 +62,9 @@ void LineShape2D::set_normal(const Vector2 &p_normal) {
_update_shape
();
}
void
LineShape2D
::
set_d
(
real_t
p_d
)
{
void
LineShape2D
::
set_d
istance
(
real_t
p_distance
)
{
d
=
p_d
;
d
istance
=
p_distance
;
_update_shape
();
}
...
...
@@ -72,14 +72,14 @@ Vector2 LineShape2D::get_normal() const {
return
normal
;
}
real_t
LineShape2D
::
get_d
()
const
{
real_t
LineShape2D
::
get_d
istance
()
const
{
return
d
;
return
d
istance
;
}
void
LineShape2D
::
draw
(
const
RID
&
p_to_rid
,
const
Color
&
p_color
)
{
Vector2
point
=
get_d
()
*
get_normal
();
Vector2
point
=
get_d
istance
()
*
get_normal
();
Vector2
l1
[
2
]
=
{
point
-
get_normal
().
tangent
()
*
100
,
point
+
get_normal
().
tangent
()
*
100
};
RS
::
get_singleton
()
->
canvas_item_add_line
(
p_to_rid
,
l1
[
0
],
l1
[
1
],
p_color
,
3
);
...
...
@@ -88,7 +88,7 @@ void LineShape2D::draw(const RID &p_to_rid, const Color &p_color) {
}
Rect2
LineShape2D
::
get_rect
()
const
{
Vector2
point
=
get_d
()
*
get_normal
();
Vector2
point
=
get_d
istance
()
*
get_normal
();
Vector2
l1
[
2
]
=
{
point
-
get_normal
().
tangent
()
*
100
,
point
+
get_normal
().
tangent
()
*
100
};
Vector2
l2
[
2
]
=
{
point
,
point
+
get_normal
()
*
30
};
...
...
@@ -101,7 +101,7 @@ Rect2 LineShape2D::get_rect() const {
}
real_t
LineShape2D
::
get_enclosing_radius
()
const
{
return
d
;
return
d
istance
;
}
void
LineShape2D
::
_bind_methods
()
{
...
...
@@ -109,17 +109,17 @@ void LineShape2D::_bind_methods() {
ClassDB
::
bind_method
(
D_METHOD
(
"set_normal"
,
"normal"
),
&
LineShape2D
::
set_normal
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_normal"
),
&
LineShape2D
::
get_normal
);
ClassDB
::
bind_method
(
D_METHOD
(
"set_d
"
,
"d"
),
&
LineShape2D
::
set_d
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_d
"
),
&
LineShape2D
::
get_d
);
ClassDB
::
bind_method
(
D_METHOD
(
"set_d
istance"
,
"distance"
),
&
LineShape2D
::
set_distance
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_d
istance"
),
&
LineShape2D
::
get_distance
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
VECTOR2
,
"normal"
),
"set_normal"
,
"get_normal"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
FLOAT
,
"d
"
),
"set_d"
,
"get_d
"
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
FLOAT
,
"d
istance"
),
"set_distance"
,
"get_distance
"
);
}
LineShape2D
::
LineShape2D
()
:
Shape2D
(
PhysicsServer2D
::
get_singleton
()
->
line_shape_create
())
{
normal
=
Vector2
(
0
,
1
);
d
=
0
;
d
istance
=
0
;
_update_shape
();
}
scene/resources/line_shape_2d.h
View file @
825a89d0
...
...
@@ -37,7 +37,7 @@ class LineShape2D : public Shape2D {
GDCLASS
(
LineShape2D
,
Shape2D
);
Vector2
normal
;
real_t
d
;
real_t
d
istance
;
void
_update_shape
();
...
...
@@ -48,10 +48,10 @@ public:
virtual
bool
_edit_is_selected_on_click
(
const
Point2
&
p_point
,
double
p_tolerance
)
const
;
void
set_normal
(
const
Vector2
&
p_normal
);
void
set_d
(
real_t
p_d
);
void
set_d
istance
(
real_t
p_distance
);
Vector2
get_normal
()
const
;
real_t
get_d
()
const
;
real_t
get_d
istance
()
const
;
virtual
void
draw
(
const
RID
&
p_to_rid
,
const
Color
&
p_color
);
virtual
Rect2
get_rect
()
const
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment