godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
cc8846bef6
godot/scene/3d
History
Fernando Cosentino cc8846bef6 Added material_overlay property to MeshInstance 
Applying overlay materials into multi-surface meshes currently
requires adding a next pass material to all the surfaces, which
might be cumbersome when the material is to be applied to a range
of different geometries. This also makes it not trivial to use
AnimationPlayer to control the material in case of visual effects.
The material_override property is not an option as it works
replacing the active material for the surfaces, not adding a new pass.

This commit adds the material_overlay property to GeometryInstance
(and therefore MeshInstance), having the same reach as
material_override (that is, all surfaces) but adding a new material
pass on top of the active materials, instead of replacing them.

Implemented in rasterizer of both GLES2 and GLES3.
2021-11-15 23:50:34 +00:00
..
area.cpp Improve area/body_shape_entered/exited signals parameter names and doc 2021-10-15 11:28:17 -04:00
area.h Return RID instead of Object id in area-body_shape_entered-exited signals. 2021-05-19 10:51:59 +01:00
arvr_nodes.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
arvr_nodes.h Style: Remove redundant void argument lists 2021-05-04 16:40:33 +02:00
audio_stream_player_3d.cpp Tweak AudioStreamPlayer3D property hints for usability 2021-10-18 11:24:42 +02:00
audio_stream_player_3d.h Style: Replaces uses of 0/NULL by nullptr (C++11) 2021-05-04 16:30:23 +02:00
baked_lightmap.cpp Add BAKE_ERROR_NO_ROOT to BakedLightmap 2021-10-21 13:32:03 +02:00
baked_lightmap.h Add BAKE_ERROR_NO_ROOT to BakedLightmap 2021-10-21 13:32:03 +02:00
bone_attachment.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
bone_attachment.h Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks 2021-05-04 14:45:16 +02:00
camera.cpp Display a editor gizmo icon for Listener 2021-09-16 23:37:12 +02:00
camera.h Display a editor gizmo icon for Listener 2021-09-16 23:37:12 +02:00
collision_object.cpp Merge pull request #54154 from bjauny/fix_areanotification 2021-10-27 20:38:55 +02:00
collision_object.h Support for 3D sync to physics 2021-06-08 16:28:58 -07:00
collision_polygon.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
collision_polygon.h Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks 2021-05-04 14:45:16 +02:00
collision_shape.cpp Create CollisionObject debug shapes using VS 2021-05-09 18:30:27 +02:00
collision_shape.h Create CollisionObject debug shapes using VS 2021-05-09 18:30:27 +02:00
cpu_particles.cpp clang-format: Disable alignment of operands, too unreliable 2021-10-28 13:23:38 +02:00
cpu_particles.h Added ring emitter for 3D particles 2021-05-09 13:18:05 +02:00
cull_instance.cpp Portals - add autoplace priority setting to CullInstance 2021-07-28 17:23:20 +01:00
cull_instance.h Portals - add autoplace priority setting to CullInstance 2021-07-28 17:23:20 +01:00
gi_probe.cpp Fix accessing scene tree without checking: MeshInstance3D::create_debug_tangents, GIProbe::bake 2021-05-17 13:08:46 +02:00
gi_probe.h Style: Replaces uses of 0/NULL by nullptr (C++11) 2021-05-04 16:30:23 +02:00
immediate_geometry.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
immediate_geometry.h Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks 2021-05-04 14:45:16 +02:00
interpolated_camera.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
interpolated_camera.h Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks 2021-05-04 14:45:16 +02:00
light.cpp Display a editor gizmo icon for Listener 2021-09-16 23:37:12 +02:00
light.h Display a editor gizmo icon for Listener 2021-09-16 23:37:12 +02:00
lightmapper.cpp CPU lightmapper fixes. 2021-01-15 12:32:54 +01:00
lightmapper.h Fix editor getting stuck after baking lightmaps from a script 2021-09-12 01:01:29 +02:00
listener.cpp Display a editor gizmo icon for Listener 2021-09-16 23:37:12 +02:00
listener.h Display a editor gizmo icon for Listener 2021-09-16 23:37:12 +02:00
mesh_instance.cpp Added material_overlay property to MeshInstance 2021-11-15 23:50:34 +00:00
mesh_instance.h Added material_overlay property to MeshInstance 2021-11-15 23:50:34 +00:00
multimesh_instance.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
multimesh_instance.h Update copyright statements to 2021 2021-01-13 16:17:06 +01:00
navigation_mesh.cpp Improve NavigationMesh typing, parameter validation and documentation 2021-08-11 18:18:27 +08:00
navigation_mesh.h Improve NavigationMesh typing, parameter validation and documentation 2021-08-11 18:18:27 +08:00
navigation.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
navigation.h Style: Replaces uses of 0/NULL by nullptr (C++11) 2021-05-04 16:30:23 +02:00
occluder.cpp Sphere occluders (portals and general use) 2021-08-17 09:02:06 +01:00
occluder.h Sphere occluders (portals and general use) 2021-08-17 09:02:06 +01:00
particles.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
particles.h Style: Set clang-format Standard to c++14 2021-05-04 14:45:15 +02:00
path.cpp Fix Path3D initial forward calculation 2021-08-07 12:40:14 +02:00
path.h Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks 2021-05-04 14:45:16 +02:00
physics_body.cpp Fix test_move reporting collision when touching another body 2021-11-10 11:07:32 -07:00
physics_body.h Backport new methods for KinematicBody and KinematicCollision 2021-08-26 12:16:40 +08:00
physics_joint.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
physics_joint.h Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks 2021-05-04 14:45:16 +02:00
portal.cpp Portals - add reason string to unload message 2021-09-24 14:00:24 +01:00
portal.h Portals - fix import of portal normal + small bug fixes 2021-09-02 10:39:47 +01:00
position_3d.cpp Update copyright statements to 2021 2021-01-13 16:17:06 +01:00
position_3d.h Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks 2021-05-04 14:45:16 +02:00
proximity_group.cpp Use loop instead of recursion when clearing proximity groups 2021-10-10 12:27:51 +02:00
proximity_group.h Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks 2021-05-04 14:45:16 +02:00
ray_cast.cpp Fix Raycast3D color update when not colliding anymore 2021-08-24 11:24:02 +02:00
ray_cast.h Add custom debug shape thickness and color options to RayCast 2021-06-19 06:01:25 +02:00
reflection_probe.cpp Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks 2021-05-04 14:45:16 +02:00
reflection_probe.h Update copyright statements to 2021 2021-01-13 16:17:06 +01:00
remote_transform.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
remote_transform.h Update copyright statements to 2021 2021-01-13 16:17:06 +01:00
room_group.cpp Portals - add reason string to unload message 2021-09-24 14:00:24 +01:00
room_group.h Portals - Add configuration warnings for nodes 2021-07-15 08:01:42 +01:00
room_manager.cpp Modules: Make sure to include modules_enabled.gen.h where needed 2021-11-12 13:45:33 +01:00
room_manager.h Portals - add reason string to unload message 2021-09-24 14:00:24 +01:00
room.cpp Portals - add reason string to unload message 2021-09-24 14:00:24 +01:00
room.h Portals - add gizmo handles for editing portals and rooms 2021-08-06 07:53:22 +01:00
SCsub SCons: Format buildsystem files with psf/black 2020-06-10 15:30:52 +02:00
skeleton.cpp Prevent being able to set bone's parent as itself 2021-09-21 22:06:03 +09:30
skeleton.h Fixes the SkeletonIK twisting issue by using the skeleton global pose without overrides 2021-05-06 20:11:21 -04:00
soft_body.cpp Fix SoftBody memory corruption when switching mesh at runtime 2021-10-20 10:52:38 -07:00
soft_body.h Fix SoftBody memory corruption when switching mesh at runtime 2021-10-20 10:52:38 -07:00
spatial_velocity_tracker.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
spatial_velocity_tracker.h Update copyright statements to 2021 2021-01-13 16:17:06 +01:00
spatial.cpp clang-format: Various fixes to comments alignment from clang-format 13 2021-10-28 14:50:32 +02:00
spatial.h Portal occlusion culling 2021-07-14 11:43:23 +01:00
spring_arm.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
spring_arm.h Update copyright statements to 2021 2021-01-13 16:17:06 +01:00
sprite_3d.cpp Fix rendering centered odd-size texture in AnimatedSprite/AnimatedSprite3D 2021-10-03 14:15:21 +02:00
sprite_3d.h Fix Octahedral/Split Stream Options 2021-08-17 16:11:47 -04:00
vehicle_body.cpp clang-format: Disable alignment of operands, too unreliable 2021-10-28 13:23:38 +02:00
vehicle_body.h Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks 2021-05-04 14:45:16 +02:00
visibility_notifier.cpp Portal occlusion culling 2021-07-14 11:43:23 +01:00
visibility_notifier.h Portal occlusion culling 2021-07-14 11:43:23 +01:00
visual_instance.cpp Added material_overlay property to MeshInstance 2021-11-15 23:50:34 +00:00
visual_instance.h Added material_overlay property to MeshInstance 2021-11-15 23:50:34 +00:00
voxel_light_baker.cpp Disable GIProbe emission when disabled on a material 2021-05-17 20:24:33 +04:00
voxel_light_baker.h Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks 2021-05-04 14:45:16 +02:00
world_environment.cpp Style: Enforce braces around if blocks and loops 2021-05-05 15:02:01 +02:00
world_environment.h Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks 2021-05-04 14:45:16 +02:00