Skip to content

Commit

Permalink
Merge pull request #51746 from Calinou/add-shader-comment-3.x
Browse files Browse the repository at this point in the history
Add a comment at the top of generated shaders (3.x)
  • Loading branch information
akien-mga committed Aug 18, 2021
2 parents 364e281 + 8dae2f9 commit 6a058cb
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
6 changes: 5 additions & 1 deletion scene/2d/canvas_item.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "core/message_queue.h"
#include "core/method_bind_ext.gen.inc"
#include "core/os/input.h"
#include "core/version.h"
#include "scene/main/canvas_layer.h"
#include "scene/main/viewport.h"
#include "scene/resources/font.h"
Expand Down Expand Up @@ -89,7 +90,10 @@ void CanvasItemMaterial::_update_shader() {

//must create a shader!

String code = "shader_type canvas_item;\nrender_mode ";
// Add a comment to describe the shader origin (useful when converting to ShaderMaterial).
String code = "// NOTE: Shader automatically converted from " VERSION_NAME " " VERSION_FULL_CONFIG "'s CanvasItemMaterial.\n\n";

code += "shader_type canvas_item;\nrender_mode ";
switch (blend_mode) {
case BLEND_MODE_MIX:
code += "blend_mix";
Expand Down
6 changes: 5 additions & 1 deletion scene/resources/material.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

#include "core/engine.h"
#include "core/project_settings.h"
#include "core/version.h"

#ifdef TOOLS_ENABLED
#include "editor/editor_settings.h"
Expand Down Expand Up @@ -386,7 +387,10 @@ void SpatialMaterial::_update_shader() {

//must create a shader!

String code = "shader_type spatial;\nrender_mode ";
// Add a comment to describe the shader origin (useful when converting to ShaderMaterial).
String code = "// NOTE: Shader automatically converted from " VERSION_NAME " " VERSION_FULL_CONFIG "'s SpatialMaterial.\n\n";

code += "shader_type spatial;\nrender_mode ";
switch (blend_mode) {
case BLEND_MODE_MIX:
code += "blend_mix";
Expand Down
7 changes: 6 additions & 1 deletion scene/resources/particles_material.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

#include "particles_material.h"

#include "core/version.h"

Mutex ParticlesMaterial::material_mutex;
SelfList<ParticlesMaterial>::List *ParticlesMaterial::dirty_materials = nullptr;
Map<ParticlesMaterial::MaterialKey, ParticlesMaterial::ShaderData> ParticlesMaterial::shader_map;
Expand Down Expand Up @@ -138,7 +140,10 @@ void ParticlesMaterial::_update_shader() {

//must create a shader!

String code = "shader_type particles;\n";
// Add a comment to describe the shader origin (useful when converting to ShaderMaterial).
String code = "// NOTE: Shader automatically converted from " VERSION_NAME " " VERSION_FULL_CONFIG "'s ParticlesMaterial.\n\n";

code += "shader_type particles;\n";

code += "uniform vec3 direction;\n";
code += "uniform float spread;\n";
Expand Down

0 comments on commit 6a058cb

Please sign in to comment.