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
61d86190
Commit
61d86190
authored
Apr 15, 2020
by
clayjohn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix texture check in decal setup
parent
5b4ea652
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
16 deletions
+13
-16
decal.cpp
scene/3d/decal.cpp
+6
-6
decal.h
scene/3d/decal.h
+3
-3
rasterizer_scene_high_end_rd.cpp
.../rendering/rasterizer_rd/rasterizer_scene_high_end_rd.cpp
+4
-7
No files found.
scene/3d/decal.cpp
View file @
61d86190
...
...
@@ -60,24 +60,24 @@ float Decal::get_emission_energy() const {
return
emission_energy
;
}
void
Decal
::
set_albedo_mix
(
float
p_
energy
)
{
albedo_mix
=
p_
energy
;
void
Decal
::
set_albedo_mix
(
float
p_
mix
)
{
albedo_mix
=
p_
mix
;
RS
::
get_singleton
()
->
decal_set_albedo_mix
(
decal
,
albedo_mix
);
}
float
Decal
::
get_albedo_mix
()
const
{
return
albedo_mix
;
}
void
Decal
::
set_upper_fade
(
float
p_
energy
)
{
upper_fade
=
p_
energy
;
void
Decal
::
set_upper_fade
(
float
p_
fade
)
{
upper_fade
=
p_
fade
;
RS
::
get_singleton
()
->
decal_set_fade
(
decal
,
upper_fade
,
lower_fade
);
}
float
Decal
::
get_upper_fade
()
const
{
return
upper_fade
;
}
void
Decal
::
set_lower_fade
(
float
p_
energy
)
{
lower_fade
=
p_
energy
;
void
Decal
::
set_lower_fade
(
float
p_
fade
)
{
lower_fade
=
p_
fade
;
RS
::
get_singleton
()
->
decal_set_fade
(
decal
,
upper_fade
,
lower_fade
);
}
float
Decal
::
get_lower_fade
()
const
{
...
...
scene/3d/decal.h
View file @
61d86190
...
...
@@ -75,7 +75,7 @@ public:
void
set_emission_energy
(
float
p_energy
);
float
get_emission_energy
()
const
;
void
set_albedo_mix
(
float
p_
energy
);
void
set_albedo_mix
(
float
p_
mix
);
float
get_albedo_mix
()
const
;
void
set_modulate
(
Color
p_modulate
);
...
...
@@ -84,10 +84,10 @@ public:
void
set_upper_fade
(
float
p_energy
);
float
get_upper_fade
()
const
;
void
set_lower_fade
(
float
p_
energy
);
void
set_lower_fade
(
float
p_
fade
);
float
get_lower_fade
()
const
;
void
set_normal_fade
(
float
p_
energy
);
void
set_normal_fade
(
float
p_
fade
);
float
get_normal_fade
()
const
;
void
set_enable_distance_fade
(
bool
p_enable
);
...
...
servers/rendering/rasterizer_rd/rasterizer_scene_high_end_rd.cpp
View file @
61d86190
...
...
@@ -2007,6 +2007,7 @@ void RasterizerSceneHighEndRD::_setup_decals(const RID *p_decal_instances, int p
dd
.
normal_fade
=
storage
->
decal_get_normal_fade
(
decal
);
RID
albedo_tex
=
storage
->
decal_get_texture
(
decal
,
RS
::
DECAL_TEXTURE_ALBEDO
);
RID
emission_tex
=
storage
->
decal_get_texture
(
decal
,
RS
::
DECAL_TEXTURE_EMISSION
);
if
(
albedo_tex
.
is_valid
())
{
Rect2
rect
=
storage
->
decal_atlas_get_texture_rect
(
albedo_tex
);
dd
.
albedo_rect
[
0
]
=
rect
.
position
.
x
;
...
...
@@ -2015,6 +2016,9 @@ void RasterizerSceneHighEndRD::_setup_decals(const RID *p_decal_instances, int p
dd
.
albedo_rect
[
3
]
=
rect
.
size
.
y
;
}
else
{
if
(
!
emission_tex
.
is_valid
())
{
continue
;
//no albedo, no emission, no decal.
}
dd
.
albedo_rect
[
0
]
=
0
;
dd
.
albedo_rect
[
1
]
=
0
;
dd
.
albedo_rect
[
2
]
=
0
;
...
...
@@ -2022,7 +2026,6 @@ void RasterizerSceneHighEndRD::_setup_decals(const RID *p_decal_instances, int p
}
RID
normal_tex
=
storage
->
decal_get_texture
(
decal
,
RS
::
DECAL_TEXTURE_NORMAL
);
RID
emission_tex
=
storage
->
decal_get_texture
(
decal
,
RS
::
DECAL_TEXTURE_EMISSION
);
if
(
normal_tex
.
is_valid
())
{
Rect2
rect
=
storage
->
decal_atlas_get_texture_rect
(
normal_tex
);
...
...
@@ -2033,13 +2036,7 @@ void RasterizerSceneHighEndRD::_setup_decals(const RID *p_decal_instances, int p
Basis
normal_xform
=
p_camera_inverse_xform
.
basis
*
xform
.
basis
.
orthonormalized
();
store_basis_3x4
(
normal_xform
,
dd
.
normal_xform
);
//store normal xform
}
else
{
if
(
!
emission_tex
.
is_valid
())
{
continue
;
//no albedo, no emission, no decal.
}
dd
.
normal_rect
[
0
]
=
0
;
dd
.
normal_rect
[
1
]
=
0
;
dd
.
normal_rect
[
2
]
=
0
;
...
...
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