From cfded120ae48b799a26ae7ecf2e40de94058f3cd Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Tue, 26 Aug 2025 07:28:40 -0700 Subject: [PATCH] Move visual shaders to a module --- .github/CODEOWNERS | 3 +- editor/editor_node.cpp | 9 - editor/inspector/editor_properties.cpp | 9 +- editor/shader/shader_editor_plugin.cpp | 5 - modules/visual_shader/SCsub | 15 ++ modules/visual_shader/config.py | 131 +++++++++++++ .../doc_classes}/VisualShader.xml | 2 +- .../doc_classes}/VisualShaderNode.xml | 2 +- .../VisualShaderNodeBillboard.xml | 2 +- .../VisualShaderNodeBooleanConstant.xml | 2 +- .../VisualShaderNodeBooleanParameter.xml | 2 +- .../doc_classes}/VisualShaderNodeClamp.xml | 2 +- .../VisualShaderNodeColorConstant.xml | 2 +- .../VisualShaderNodeColorFunc.xml | 2 +- .../doc_classes}/VisualShaderNodeColorOp.xml | 2 +- .../VisualShaderNodeColorParameter.xml | 2 +- .../doc_classes}/VisualShaderNodeComment.xml | 2 +- .../doc_classes}/VisualShaderNodeCompare.xml | 2 +- .../doc_classes}/VisualShaderNodeConstant.xml | 2 +- .../doc_classes}/VisualShaderNodeCubemap.xml | 2 +- .../VisualShaderNodeCubemapParameter.xml | 2 +- .../VisualShaderNodeCurveTexture.xml | 2 +- .../VisualShaderNodeCurveXYZTexture.xml | 2 +- .../doc_classes}/VisualShaderNodeCustom.xml | 2 +- .../VisualShaderNodeDerivativeFunc.xml | 2 +- .../VisualShaderNodeDeterminant.xml | 2 +- .../VisualShaderNodeDistanceFade.xml | 2 +- .../VisualShaderNodeDotProduct.xml | 2 +- .../VisualShaderNodeExpression.xml | 2 +- .../VisualShaderNodeFaceForward.xml | 2 +- .../VisualShaderNodeFloatConstant.xml | 2 +- .../VisualShaderNodeFloatFunc.xml | 2 +- .../doc_classes}/VisualShaderNodeFloatOp.xml | 2 +- .../VisualShaderNodeFloatParameter.xml | 2 +- .../doc_classes}/VisualShaderNodeFrame.xml | 2 +- .../doc_classes}/VisualShaderNodeFresnel.xml | 2 +- .../VisualShaderNodeGlobalExpression.xml | 2 +- .../VisualShaderNodeGroupBase.xml | 2 +- .../doc_classes}/VisualShaderNodeIf.xml | 2 +- .../doc_classes}/VisualShaderNodeInput.xml | 2 +- .../VisualShaderNodeIntConstant.xml | 2 +- .../doc_classes}/VisualShaderNodeIntFunc.xml | 2 +- .../doc_classes}/VisualShaderNodeIntOp.xml | 2 +- .../VisualShaderNodeIntParameter.xml | 2 +- .../doc_classes}/VisualShaderNodeIs.xml | 2 +- .../VisualShaderNodeLinearSceneDepth.xml | 2 +- .../doc_classes}/VisualShaderNodeMix.xml | 2 +- .../VisualShaderNodeMultiplyAdd.xml | 2 +- .../VisualShaderNodeOuterProduct.xml | 2 +- .../doc_classes}/VisualShaderNodeOutput.xml | 2 +- .../VisualShaderNodeParameter.xml | 2 +- .../VisualShaderNodeParameterRef.xml | 2 +- .../VisualShaderNodeParticleAccelerator.xml | 2 +- .../VisualShaderNodeParticleBoxEmitter.xml | 2 +- .../VisualShaderNodeParticleConeVelocity.xml | 2 +- .../VisualShaderNodeParticleEmit.xml | 2 +- .../VisualShaderNodeParticleEmitter.xml | 2 +- .../VisualShaderNodeParticleMeshEmitter.xml | 2 +- ...lShaderNodeParticleMultiplyByAxisAngle.xml | 2 +- .../VisualShaderNodeParticleOutput.xml | 2 +- .../VisualShaderNodeParticleRandomness.xml | 2 +- .../VisualShaderNodeParticleRingEmitter.xml | 2 +- .../VisualShaderNodeParticleSphereEmitter.xml | 2 +- .../VisualShaderNodeProximityFade.xml | 2 +- .../VisualShaderNodeRandomRange.xml | 2 +- .../doc_classes}/VisualShaderNodeRemap.xml | 2 +- .../doc_classes}/VisualShaderNodeReroute.xml | 2 +- .../VisualShaderNodeResizableBase.xml | 2 +- .../VisualShaderNodeRotationByAxis.xml | 2 +- .../VisualShaderNodeSDFRaymarch.xml | 2 +- .../VisualShaderNodeSDFToScreenUV.xml | 2 +- .../doc_classes}/VisualShaderNodeSample3D.xml | 2 +- ...VisualShaderNodeScreenNormalWorldSpace.xml | 2 +- .../VisualShaderNodeScreenUVToSDF.xml | 2 +- .../VisualShaderNodeSmoothStep.xml | 2 +- .../doc_classes}/VisualShaderNodeStep.xml | 2 +- .../doc_classes}/VisualShaderNodeSwitch.xml | 2 +- .../doc_classes}/VisualShaderNodeTexture.xml | 2 +- .../VisualShaderNodeTexture2DArray.xml | 2 +- ...isualShaderNodeTexture2DArrayParameter.xml | 2 +- .../VisualShaderNodeTexture2DParameter.xml | 2 +- .../VisualShaderNodeTexture3D.xml | 2 +- .../VisualShaderNodeTexture3DParameter.xml | 2 +- .../VisualShaderNodeTextureParameter.xml | 2 +- ...ualShaderNodeTextureParameterTriplanar.xml | 2 +- .../VisualShaderNodeTextureSDF.xml | 2 +- .../VisualShaderNodeTextureSDFNormal.xml | 2 +- .../VisualShaderNodeTransformCompose.xml | 2 +- .../VisualShaderNodeTransformConstant.xml | 2 +- .../VisualShaderNodeTransformDecompose.xml | 2 +- .../VisualShaderNodeTransformFunc.xml | 2 +- .../VisualShaderNodeTransformOp.xml | 2 +- .../VisualShaderNodeTransformParameter.xml | 2 +- .../VisualShaderNodeTransformVecMult.xml | 2 +- .../VisualShaderNodeUIntConstant.xml | 2 +- .../doc_classes}/VisualShaderNodeUIntFunc.xml | 2 +- .../doc_classes}/VisualShaderNodeUIntOp.xml | 2 +- .../VisualShaderNodeUIntParameter.xml | 2 +- .../doc_classes}/VisualShaderNodeUVFunc.xml | 2 +- .../VisualShaderNodeUVPolarCoord.xml | 2 +- .../doc_classes}/VisualShaderNodeVarying.xml | 2 +- .../VisualShaderNodeVaryingGetter.xml | 2 +- .../VisualShaderNodeVaryingSetter.xml | 2 +- .../VisualShaderNodeVec2Constant.xml | 2 +- .../VisualShaderNodeVec2Parameter.xml | 2 +- .../VisualShaderNodeVec3Constant.xml | 2 +- .../VisualShaderNodeVec3Parameter.xml | 2 +- .../VisualShaderNodeVec4Constant.xml | 2 +- .../VisualShaderNodeVec4Parameter.xml | 2 +- .../VisualShaderNodeVectorBase.xml | 2 +- .../VisualShaderNodeVectorCompose.xml | 2 +- .../VisualShaderNodeVectorDecompose.xml | 2 +- .../VisualShaderNodeVectorDistance.xml | 2 +- .../VisualShaderNodeVectorFunc.xml | 2 +- .../VisualShaderNodeVectorLen.xml | 2 +- .../doc_classes}/VisualShaderNodeVectorOp.xml | 2 +- .../VisualShaderNodeVectorRefract.xml | 2 +- ...VisualShaderNodeWorldPositionFromDepth.xml | 2 +- .../editor}/visual_shader_editor_plugin.cpp | 5 +- .../editor}/visual_shader_editor_plugin.h | 3 +- .../editor}/visual_shader_language_plugin.cpp | 2 +- .../editor}/visual_shader_language_plugin.h | 0 modules/visual_shader/register_types.cpp | 185 ++++++++++++++++++ modules/visual_shader/register_types.h | 36 ++++ .../tests}/test_visual_shader.cpp | 2 +- .../visual_shader}/visual_shader.cpp | 5 +- .../visual_shader}/visual_shader.h | 0 .../vs_nodes}/visual_shader_nodes.compat.inc | 0 .../vs_nodes}/visual_shader_nodes.cpp | 0 .../vs_nodes}/visual_shader_nodes.h | 3 +- .../visual_shader_particle_nodes.cpp | 0 .../vs_nodes}/visual_shader_particle_nodes.h | 2 +- .../vs_nodes}/visual_shader_sdf_nodes.cpp | 0 .../vs_nodes}/visual_shader_sdf_nodes.h | 2 +- scene/register_scene_types.cpp | 120 ------------ 135 files changed, 503 insertions(+), 258 deletions(-) create mode 100644 modules/visual_shader/SCsub create mode 100644 modules/visual_shader/config.py rename {doc/classes => modules/visual_shader/doc_classes}/VisualShader.xml (99%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNode.xml (99%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeBillboard.xml (96%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeBooleanConstant.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeBooleanParameter.xml (90%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeClamp.xml (95%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeColorConstant.xml (90%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeColorFunc.xml (97%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeColorOp.xml (97%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeColorParameter.xml (91%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeComment.xml (97%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeCompare.xml (98%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeConstant.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeCubemap.xml (97%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeCubemapParameter.xml (95%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeCurveTexture.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeCurveXYZTexture.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeCustom.xml (99%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeDerivativeFunc.xml (97%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeDeterminant.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeDistanceFade.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeDotProduct.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeExpression.xml (93%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeFaceForward.xml (90%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeFloatConstant.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeFloatFunc.xml (99%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeFloatOp.xml (97%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeFloatParameter.xml (96%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeFrame.xml (96%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeFresnel.xml (87%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeGlobalExpression.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeGroupBase.xml (98%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeIf.xml (93%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeInput.xml (95%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeIntConstant.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeIntFunc.xml (95%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeIntOp.xml (97%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeIntParameter.xml (97%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeIs.xml (94%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeLinearSceneDepth.xml (85%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeMix.xml (96%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeMultiplyAdd.xml (94%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeOuterProduct.xml (91%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeOutput.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParameter.xml (96%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParameterRef.xml (91%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParticleAccelerator.xml (94%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParticleBoxEmitter.xml (95%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParticleConeVelocity.xml (87%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParticleEmit.xml (96%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParticleEmitter.xml (91%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParticleMeshEmitter.xml (97%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParticleMultiplyByAxisAngle.xml (89%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParticleOutput.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParticleRandomness.xml (94%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParticleRingEmitter.xml (95%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeParticleSphereEmitter.xml (94%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeProximityFade.xml (85%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeRandomRange.xml (89%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeRemap.xml (97%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeReroute.xml (91%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeResizableBase.xml (89%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeRotationByAxis.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeSDFRaymarch.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeSDFToScreenUV.xml (87%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeSample3D.xml (93%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeScreenNormalWorldSpace.xml (84%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeScreenUVToSDF.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeSmoothStep.xml (96%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeStep.xml (96%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeSwitch.xml (96%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTexture.xml (98%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTexture2DArray.xml (89%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTexture2DArrayParameter.xml (94%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTexture2DParameter.xml (94%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTexture3D.xml (90%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTexture3DParameter.xml (94%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTextureParameter.xml (98%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTextureParameterTriplanar.xml (94%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTextureSDF.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTextureSDFNormal.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTransformCompose.xml (87%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTransformConstant.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTransformDecompose.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTransformFunc.xml (93%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTransformOp.xml (96%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTransformParameter.xml (91%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeTransformVecMult.xml (95%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeUIntConstant.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeUIntFunc.xml (94%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeUIntOp.xml (97%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeUIntParameter.xml (92%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeUVFunc.xml (95%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeUVPolarCoord.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVarying.xml (93%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVaryingGetter.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVaryingSetter.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVec2Constant.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVec2Parameter.xml (91%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVec3Constant.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVec3Parameter.xml (91%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVec4Constant.xml (89%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVec4Parameter.xml (91%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVectorBase.xml (94%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVectorCompose.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVectorDecompose.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVectorDistance.xml (86%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVectorFunc.xml (98%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVectorLen.xml (84%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVectorOp.xml (96%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeVectorRefract.xml (88%) rename {doc/classes => modules/visual_shader/doc_classes}/VisualShaderNodeWorldPositionFromDepth.xml (87%) rename {editor/shader => modules/visual_shader/editor}/visual_shader_editor_plugin.cpp (99%) rename {editor/shader => modules/visual_shader/editor}/visual_shader_editor_plugin.h (99%) rename {editor/shader => modules/visual_shader/editor}/visual_shader_language_plugin.cpp (98%) rename {editor/shader => modules/visual_shader/editor}/visual_shader_language_plugin.h (100%) create mode 100644 modules/visual_shader/register_types.cpp create mode 100644 modules/visual_shader/register_types.h rename {tests/scene => modules/visual_shader/tests}/test_visual_shader.cpp (99%) rename {scene/resources => modules/visual_shader}/visual_shader.cpp (99%) rename {scene/resources => modules/visual_shader}/visual_shader.h (100%) rename {scene/resources => modules/visual_shader/vs_nodes}/visual_shader_nodes.compat.inc (100%) rename {scene/resources => modules/visual_shader/vs_nodes}/visual_shader_nodes.cpp (100%) rename {scene/resources => modules/visual_shader/vs_nodes}/visual_shader_nodes.h (99%) rename {scene/resources => modules/visual_shader/vs_nodes}/visual_shader_particle_nodes.cpp (100%) rename {scene/resources => modules/visual_shader/vs_nodes}/visual_shader_particle_nodes.h (99%) rename {scene/resources => modules/visual_shader/vs_nodes}/visual_shader_sdf_nodes.cpp (100%) rename {scene/resources => modules/visual_shader/vs_nodes}/visual_shader_sdf_nodes.h (99%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6ead6b2fb7..45c96beb28 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -147,6 +147,8 @@ /modules/meshoptimizer/ @godotengine/rendering /modules/raycast/ @godotengine/rendering /modules/vhacd/ @godotengine/rendering +/modules/visual_shader/ @godotengine/shaders +/modules/visual_shader/doc_classes/ @godotengine/shaders @godotengine/documentation /modules/xatlas_unwrap/ @godotengine/rendering ## Scripting @@ -252,7 +254,6 @@ /scene/resources/shader* @godotengine/shaders /scene/resources/skeleton* @godotengine/animation /scene/resources/text_* @godotengine/gui-nodes -/scene/resources/visual_shader* @godotengine/shaders /scene/theme/ @godotengine/gui-nodes # Servers diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index db99a02843..c2399db751 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -142,7 +142,6 @@ #include "editor/settings/editor_settings_dialog.h" #include "editor/settings/project_settings_editor.h" #include "editor/shader/editor_native_shader_source_visualizer.h" -#include "editor/shader/visual_shader_editor_plugin.h" #include "editor/themes/editor_color_map.h" #include "editor/themes/editor_scale.h" #include "editor/themes/editor_theme_manager.h" @@ -8561,10 +8560,6 @@ EditorNode::EditorNode() { rmp.instantiate(); EditorInspector::add_inspector_plugin(rmp); - Ref smp; - smp.instantiate(); - EditorInspector::add_inspector_plugin(smp); - Ref ppm; ppm.instantiate(); EditorInspector::add_inspector_plugin(ppm); @@ -9428,10 +9423,6 @@ EditorNode::EditorNode() { Ref fog_mat_convert; fog_mat_convert.instantiate(); resource_conversion_plugins.push_back(fog_mat_convert); - - Ref vshader_convert; - vshader_convert.instantiate(); - resource_conversion_plugins.push_back(vshader_convert); } update_spinner_step_msec = OS::get_singleton()->get_ticks_msec(); diff --git a/editor/inspector/editor_properties.cpp b/editor/inspector/editor_properties.cpp index c1dd6248d7..00e96dd876 100644 --- a/editor/inspector/editor_properties.cpp +++ b/editor/inspector/editor_properties.cpp @@ -66,9 +66,14 @@ #include "scene/resources/font.h" #include "scene/resources/mesh.h" #include "scene/resources/sky.h" -#include "scene/resources/visual_shader_nodes.h" #include "servers/display/display_server.h" +#include "modules/modules_enabled.gen.h" + +#ifdef MODULE_VISUAL_SHADER_ENABLED +#include "modules/visual_shader/vs_nodes/visual_shader_nodes.h" +#endif // MODULE_VISUAL_SHADER_ENABLED + ///////////////////// NIL ///////////////////////// void EditorPropertyNil::update_property() { @@ -3438,12 +3443,14 @@ void EditorPropertyResource::_resource_changed(const Ref &p_resource) Ref vpt = p_resource; if (vpt.is_valid()) { r = Object::cast_to(get_edited_object()); +#ifdef MODULE_VISUAL_SHADER_ENABLED if (Object::cast_to(r)) { EditorNode::get_singleton()->show_warning(TTR("Can't create a ViewportTexture in a Texture2D node because the texture will not be bound to a scene.\nUse a Texture2DParameter node instead and set the texture in the \"Shader Parameters\" tab.")); emit_changed(get_edited_property(), Ref()); update_property(); return; } +#endif // MODULE_VISUAL_SHADER_ENABLED if (r && r->get_path().is_resource_file()) { EditorNode::get_singleton()->show_warning(TTR("Can't create a ViewportTexture on resources saved as a file.\nResource needs to belong to a scene.")); diff --git a/editor/shader/shader_editor_plugin.cpp b/editor/shader/shader_editor_plugin.cpp index e66e67df5c..cff3caf146 100644 --- a/editor/shader/shader_editor_plugin.cpp +++ b/editor/shader/shader_editor_plugin.cpp @@ -44,7 +44,6 @@ #include "editor/shader/shader_create_dialog.h" #include "editor/shader/text_shader_editor.h" #include "editor/shader/text_shader_language_plugin.h" -#include "editor/shader/visual_shader_language_plugin.h" #include "editor/themes/editor_scale.h" #include "scene/gui/item_list.h" #include "scene/gui/tab_container.h" @@ -931,10 +930,6 @@ ShaderEditorPlugin::ShaderEditorPlugin() { Ref text_shader_lang; text_shader_lang.instantiate(); EditorShaderLanguagePlugin::register_shader_language(text_shader_lang); - - Ref visual_shader_lang; - visual_shader_lang.instantiate(); - EditorShaderLanguagePlugin::register_shader_language(visual_shader_lang); } ShaderEditorPlugin::~ShaderEditorPlugin() { diff --git a/modules/visual_shader/SCsub b/modules/visual_shader/SCsub new file mode 100644 index 0000000000..86ca5c9641 --- /dev/null +++ b/modules/visual_shader/SCsub @@ -0,0 +1,15 @@ +#!/usr/bin/env python +from misc.utility.scons_hints import * + +Import("env") +Import("env_modules") + +env_modules.Append(CPPDEFINES=["GODOT_MODULE"]) + +env_visual_shader = env_modules.Clone() + +env_visual_shader.add_source_files(env.modules_sources, "*.cpp") +env_visual_shader.add_source_files(env.modules_sources, "vs_nodes/*.cpp") + +if env.editor_build: + env_visual_shader.add_source_files(env.modules_sources, "editor/*.cpp") diff --git a/modules/visual_shader/config.py b/modules/visual_shader/config.py new file mode 100644 index 0000000000..5bcccdf60d --- /dev/null +++ b/modules/visual_shader/config.py @@ -0,0 +1,131 @@ +def can_build(env, platform): + return True + + +def configure(env): + pass + + +def get_doc_classes(): + return [ + "VisualShader", + "VisualShaderNode", + "VisualShaderNodeBillboard", + "VisualShaderNodeBooleanConstant", + "VisualShaderNodeBooleanParameter", + "VisualShaderNodeClamp", + "VisualShaderNodeColorConstant", + "VisualShaderNodeColorFunc", + "VisualShaderNodeColorOp", + "VisualShaderNodeColorParameter", + "VisualShaderNodeComment", + "VisualShaderNodeCompare", + "VisualShaderNodeConstant", + "VisualShaderNodeCubemap", + "VisualShaderNodeCubemapParameter", + "VisualShaderNodeCurveTexture", + "VisualShaderNodeCurveXYZTexture", + "VisualShaderNodeCustom", + "VisualShaderNodeDerivativeFunc", + "VisualShaderNodeDeterminant", + "VisualShaderNodeDistanceFade", + "VisualShaderNodeDotProduct", + "VisualShaderNodeExpression", + "VisualShaderNodeFaceForward", + "VisualShaderNodeFloatConstant", + "VisualShaderNodeFloatFunc", + "VisualShaderNodeFloatOp", + "VisualShaderNodeFloatParameter", + "VisualShaderNodeFrame", + "VisualShaderNodeFresnel", + "VisualShaderNodeGlobalExpression", + "VisualShaderNodeGroupBase", + "VisualShaderNodeIf", + "VisualShaderNodeInput", + "VisualShaderNodeIntConstant", + "VisualShaderNodeIntFunc", + "VisualShaderNodeIntOp", + "VisualShaderNodeIntParameter", + "VisualShaderNodeIs", + "VisualShaderNodeLinearSceneDepth", + "VisualShaderNodeMix", + "VisualShaderNodeMultiplyAdd", + "VisualShaderNodeOuterProduct", + "VisualShaderNodeOutput", + "VisualShaderNodeParameter", + "VisualShaderNodeParameterRef", + "VisualShaderNodeParticleAccelerator", + "VisualShaderNodeParticleBoxEmitter", + "VisualShaderNodeParticleConeVelocity", + "VisualShaderNodeParticleEmit", + "VisualShaderNodeParticleEmitter", + "VisualShaderNodeParticleMeshEmitter", + "VisualShaderNodeParticleMultiplyByAxisAngle", + "VisualShaderNodeParticleOutput", + "VisualShaderNodeParticleRandomness", + "VisualShaderNodeParticleRingEmitter", + "VisualShaderNodeParticleSphereEmitter", + "VisualShaderNodeProximityFade", + "VisualShaderNodeRandomRange", + "VisualShaderNodeRemap", + "VisualShaderNodeReroute", + "VisualShaderNodeResizableBase", + "VisualShaderNodeRotationByAxis", + "VisualShaderNodeSample3D", + "VisualShaderNodeScreenNormalWorldSpace", + "VisualShaderNodeScreenUVToSDF", + "VisualShaderNodeSDFRaymarch", + "VisualShaderNodeSDFToScreenUV", + "VisualShaderNodeSmoothStep", + "VisualShaderNodeStep", + "VisualShaderNodeSwitch", + "VisualShaderNodeTexture", + "VisualShaderNodeTexture2DArray", + "VisualShaderNodeTexture2DArrayParameter", + "VisualShaderNodeTexture2DParameter", + "VisualShaderNodeTexture3D", + "VisualShaderNodeTexture3DParameter", + "VisualShaderNodeTextureParameter", + "VisualShaderNodeTextureParameterTriplanar", + "VisualShaderNodeTextureSDF", + "VisualShaderNodeTextureSDFNormal", + "VisualShaderNodeTransformCompose", + "VisualShaderNodeTransformConstant", + "VisualShaderNodeTransformDecompose", + "VisualShaderNodeTransformFunc", + "VisualShaderNodeTransformOp", + "VisualShaderNodeTransformParameter", + "VisualShaderNodeTransformVecMult", + "VisualShaderNodeUIntConstant", + "VisualShaderNodeUIntFunc", + "VisualShaderNodeUIntOp", + "VisualShaderNodeUIntParameter", + "VisualShaderNodeUVFunc", + "VisualShaderNodeUVPolarCoord", + "VisualShaderNodeVarying", + "VisualShaderNodeVaryingGetter", + "VisualShaderNodeVaryingSetter", + "VisualShaderNodeVec2Constant", + "VisualShaderNodeVec2Parameter", + "VisualShaderNodeVec3Constant", + "VisualShaderNodeVec3Parameter", + "VisualShaderNodeVec4Constant", + "VisualShaderNodeVec4Parameter", + "VisualShaderNodeVectorBase", + "VisualShaderNodeVectorCompose", + "VisualShaderNodeVectorDecompose", + "VisualShaderNodeVectorDistance", + "VisualShaderNodeVectorFunc", + "VisualShaderNodeVectorLen", + "VisualShaderNodeVectorOp", + "VisualShaderNodeVectorRefract", + "VisualShaderNodeWorldPositionFromDepth", + ] + + +def get_doc_path(): + return "doc_classes" + + +def get_icons_path(): + return "icons" diff --git a/doc/classes/VisualShader.xml b/modules/visual_shader/doc_classes/VisualShader.xml similarity index 99% rename from doc/classes/VisualShader.xml rename to modules/visual_shader/doc_classes/VisualShader.xml index dae8019e7a..f3d2bc975c 100644 --- a/doc/classes/VisualShader.xml +++ b/modules/visual_shader/doc_classes/VisualShader.xml @@ -1,5 +1,5 @@ - + A custom shader program with a visual editor. diff --git a/doc/classes/VisualShaderNode.xml b/modules/visual_shader/doc_classes/VisualShaderNode.xml similarity index 99% rename from doc/classes/VisualShaderNode.xml rename to modules/visual_shader/doc_classes/VisualShaderNode.xml index 75a024eecb..333fb810b6 100644 --- a/doc/classes/VisualShaderNode.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNode.xml @@ -1,5 +1,5 @@ - + Base class for [VisualShader] nodes. Not related to scene nodes. diff --git a/doc/classes/VisualShaderNodeBillboard.xml b/modules/visual_shader/doc_classes/VisualShaderNodeBillboard.xml similarity index 96% rename from doc/classes/VisualShaderNodeBillboard.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeBillboard.xml index c38f8b8933..d610db1395 100644 --- a/doc/classes/VisualShaderNodeBillboard.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeBillboard.xml @@ -1,5 +1,5 @@ - + A node that controls how the object faces the camera to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeBooleanConstant.xml b/modules/visual_shader/doc_classes/VisualShaderNodeBooleanConstant.xml similarity index 88% rename from doc/classes/VisualShaderNodeBooleanConstant.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeBooleanConstant.xml index fd536c8a31..b7e26b61ff 100644 --- a/doc/classes/VisualShaderNodeBooleanConstant.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeBooleanConstant.xml @@ -1,5 +1,5 @@ - + A boolean constant to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeBooleanParameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeBooleanParameter.xml similarity index 90% rename from doc/classes/VisualShaderNodeBooleanParameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeBooleanParameter.xml index ff19c2949d..b02592cc63 100644 --- a/doc/classes/VisualShaderNodeBooleanParameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeBooleanParameter.xml @@ -1,5 +1,5 @@ - + A boolean parameter to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeClamp.xml b/modules/visual_shader/doc_classes/VisualShaderNodeClamp.xml similarity index 95% rename from doc/classes/VisualShaderNodeClamp.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeClamp.xml index ed8f9b5f96..6f3344117a 100644 --- a/doc/classes/VisualShaderNodeClamp.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeClamp.xml @@ -1,5 +1,5 @@ - + Clamps a value within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeColorConstant.xml b/modules/visual_shader/doc_classes/VisualShaderNodeColorConstant.xml similarity index 90% rename from doc/classes/VisualShaderNodeColorConstant.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeColorConstant.xml index 51a9f52f40..39b99df2cc 100644 --- a/doc/classes/VisualShaderNodeColorConstant.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeColorConstant.xml @@ -1,5 +1,5 @@ - + A [Color] constant to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeColorFunc.xml b/modules/visual_shader/doc_classes/VisualShaderNodeColorFunc.xml similarity index 97% rename from doc/classes/VisualShaderNodeColorFunc.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeColorFunc.xml index 21947ac646..b709bd99b5 100644 --- a/doc/classes/VisualShaderNodeColorFunc.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeColorFunc.xml @@ -1,5 +1,5 @@ - + A [Color] function to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeColorOp.xml b/modules/visual_shader/doc_classes/VisualShaderNodeColorOp.xml similarity index 97% rename from doc/classes/VisualShaderNodeColorOp.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeColorOp.xml index eba02845c8..02232a207a 100644 --- a/doc/classes/VisualShaderNodeColorOp.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeColorOp.xml @@ -1,5 +1,5 @@ - + A [Color] operator to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeColorParameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeColorParameter.xml similarity index 91% rename from doc/classes/VisualShaderNodeColorParameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeColorParameter.xml index 545eb983df..6182b3eaf1 100644 --- a/doc/classes/VisualShaderNodeColorParameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeColorParameter.xml @@ -1,5 +1,5 @@ - + A [Color] parameter to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeComment.xml b/modules/visual_shader/doc_classes/VisualShaderNodeComment.xml similarity index 97% rename from doc/classes/VisualShaderNodeComment.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeComment.xml index 9e65a52102..2ad85822f8 100644 --- a/doc/classes/VisualShaderNodeComment.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeComment.xml @@ -1,5 +1,5 @@ - + Only exists for compatibility. Use [VisualShaderNodeFrame] as a replacement. diff --git a/doc/classes/VisualShaderNodeCompare.xml b/modules/visual_shader/doc_classes/VisualShaderNodeCompare.xml similarity index 98% rename from doc/classes/VisualShaderNodeCompare.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeCompare.xml index 489dbb8203..768a7912eb 100644 --- a/doc/classes/VisualShaderNodeCompare.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeCompare.xml @@ -1,5 +1,5 @@ - + A comparison function for common types within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeConstant.xml b/modules/visual_shader/doc_classes/VisualShaderNodeConstant.xml similarity index 86% rename from doc/classes/VisualShaderNodeConstant.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeConstant.xml index 868489f5ff..84fc564c00 100644 --- a/doc/classes/VisualShaderNodeConstant.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeConstant.xml @@ -1,5 +1,5 @@ - + A base type for the constants within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeCubemap.xml b/modules/visual_shader/doc_classes/VisualShaderNodeCubemap.xml similarity index 97% rename from doc/classes/VisualShaderNodeCubemap.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeCubemap.xml index 06b183d929..55f3687185 100644 --- a/doc/classes/VisualShaderNodeCubemap.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeCubemap.xml @@ -1,5 +1,5 @@ - + A [Cubemap] sampling node to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeCubemapParameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeCubemapParameter.xml similarity index 95% rename from doc/classes/VisualShaderNodeCubemapParameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeCubemapParameter.xml index 47f2fd94ea..1a1496156f 100644 --- a/doc/classes/VisualShaderNodeCubemapParameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeCubemapParameter.xml @@ -1,5 +1,5 @@ - + A [Cubemap] parameter node to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeCurveTexture.xml b/modules/visual_shader/doc_classes/VisualShaderNodeCurveTexture.xml similarity index 86% rename from doc/classes/VisualShaderNodeCurveTexture.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeCurveTexture.xml index dacdf79689..e4edbed94b 100644 --- a/doc/classes/VisualShaderNodeCurveTexture.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeCurveTexture.xml @@ -1,5 +1,5 @@ - + Performs a [CurveTexture] lookup within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeCurveXYZTexture.xml b/modules/visual_shader/doc_classes/VisualShaderNodeCurveXYZTexture.xml similarity index 86% rename from doc/classes/VisualShaderNodeCurveXYZTexture.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeCurveXYZTexture.xml index 78b54c7ef6..c25f15fdd7 100644 --- a/doc/classes/VisualShaderNodeCurveXYZTexture.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeCurveXYZTexture.xml @@ -1,5 +1,5 @@ - + Performs a [CurveXYZTexture] lookup within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeCustom.xml b/modules/visual_shader/doc_classes/VisualShaderNodeCustom.xml similarity index 99% rename from doc/classes/VisualShaderNodeCustom.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeCustom.xml index a32570395a..639ff25c78 100644 --- a/doc/classes/VisualShaderNodeCustom.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeCustom.xml @@ -1,5 +1,5 @@ - + Virtual class to define custom [VisualShaderNode]s for use in the Visual Shader Editor. diff --git a/doc/classes/VisualShaderNodeDerivativeFunc.xml b/modules/visual_shader/doc_classes/VisualShaderNodeDerivativeFunc.xml similarity index 97% rename from doc/classes/VisualShaderNodeDerivativeFunc.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeDerivativeFunc.xml index fa34ea2316..46f2ddc699 100644 --- a/doc/classes/VisualShaderNodeDerivativeFunc.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeDerivativeFunc.xml @@ -1,5 +1,5 @@ - + Calculates a derivative within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeDeterminant.xml b/modules/visual_shader/doc_classes/VisualShaderNodeDeterminant.xml similarity index 86% rename from doc/classes/VisualShaderNodeDeterminant.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeDeterminant.xml index a32490f443..42892074c9 100644 --- a/doc/classes/VisualShaderNodeDeterminant.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeDeterminant.xml @@ -1,5 +1,5 @@ - + Calculates the determinant of a [Transform3D] within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeDistanceFade.xml b/modules/visual_shader/doc_classes/VisualShaderNodeDistanceFade.xml similarity index 86% rename from doc/classes/VisualShaderNodeDistanceFade.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeDistanceFade.xml index 9a905bfbdb..62b1e5b853 100644 --- a/doc/classes/VisualShaderNodeDistanceFade.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeDistanceFade.xml @@ -1,5 +1,5 @@ - + A visual shader node representing distance fade effect. diff --git a/doc/classes/VisualShaderNodeDotProduct.xml b/modules/visual_shader/doc_classes/VisualShaderNodeDotProduct.xml similarity index 86% rename from doc/classes/VisualShaderNodeDotProduct.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeDotProduct.xml index e7367c9154..da285eafdf 100644 --- a/doc/classes/VisualShaderNodeDotProduct.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeDotProduct.xml @@ -1,5 +1,5 @@ - + Calculates a dot product of two vectors within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeExpression.xml b/modules/visual_shader/doc_classes/VisualShaderNodeExpression.xml similarity index 93% rename from doc/classes/VisualShaderNodeExpression.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeExpression.xml index e8862fbcd2..73eebb10da 100644 --- a/doc/classes/VisualShaderNodeExpression.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeExpression.xml @@ -1,5 +1,5 @@ - + A custom visual shader graph expression written in Godot Shading Language. diff --git a/doc/classes/VisualShaderNodeFaceForward.xml b/modules/visual_shader/doc_classes/VisualShaderNodeFaceForward.xml similarity index 90% rename from doc/classes/VisualShaderNodeFaceForward.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeFaceForward.xml index ae56d24b89..fd547052e2 100644 --- a/doc/classes/VisualShaderNodeFaceForward.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeFaceForward.xml @@ -1,5 +1,5 @@ - + Returns the vector that points in the same direction as a reference vector within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeFloatConstant.xml b/modules/visual_shader/doc_classes/VisualShaderNodeFloatConstant.xml similarity index 88% rename from doc/classes/VisualShaderNodeFloatConstant.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeFloatConstant.xml index 96c3cc926f..e43bafc093 100644 --- a/doc/classes/VisualShaderNodeFloatConstant.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeFloatConstant.xml @@ -1,5 +1,5 @@ - + A scalar floating-point constant to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeFloatFunc.xml b/modules/visual_shader/doc_classes/VisualShaderNodeFloatFunc.xml similarity index 99% rename from doc/classes/VisualShaderNodeFloatFunc.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeFloatFunc.xml index 2825fc277a..e7512ca252 100644 --- a/doc/classes/VisualShaderNodeFloatFunc.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeFloatFunc.xml @@ -1,5 +1,5 @@ - + A scalar floating-point function to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeFloatOp.xml b/modules/visual_shader/doc_classes/VisualShaderNodeFloatOp.xml similarity index 97% rename from doc/classes/VisualShaderNodeFloatOp.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeFloatOp.xml index 61c25092de..5d6d8b2ae2 100644 --- a/doc/classes/VisualShaderNodeFloatOp.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeFloatOp.xml @@ -1,5 +1,5 @@ - + A floating-point scalar operator to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeFloatParameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeFloatParameter.xml similarity index 96% rename from doc/classes/VisualShaderNodeFloatParameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeFloatParameter.xml index 67b8495aaa..5753d3082b 100644 --- a/doc/classes/VisualShaderNodeFloatParameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeFloatParameter.xml @@ -1,5 +1,5 @@ - + A scalar float parameter to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeFrame.xml b/modules/visual_shader/doc_classes/VisualShaderNodeFrame.xml similarity index 96% rename from doc/classes/VisualShaderNodeFrame.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeFrame.xml index 85e042d51b..00fbfa5a13 100644 --- a/doc/classes/VisualShaderNodeFrame.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeFrame.xml @@ -1,5 +1,5 @@ - + A frame other visual shader nodes can be attached to for better organization. diff --git a/doc/classes/VisualShaderNodeFresnel.xml b/modules/visual_shader/doc_classes/VisualShaderNodeFresnel.xml similarity index 87% rename from doc/classes/VisualShaderNodeFresnel.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeFresnel.xml index 4061409281..44ba0bdeac 100644 --- a/doc/classes/VisualShaderNodeFresnel.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeFresnel.xml @@ -1,5 +1,5 @@ - + A Fresnel effect to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeGlobalExpression.xml b/modules/visual_shader/doc_classes/VisualShaderNodeGlobalExpression.xml similarity index 88% rename from doc/classes/VisualShaderNodeGlobalExpression.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeGlobalExpression.xml index 35dc368bb5..b228ccbc71 100644 --- a/doc/classes/VisualShaderNodeGlobalExpression.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeGlobalExpression.xml @@ -1,5 +1,5 @@ - + A custom global visual shader graph expression written in Godot Shading Language. diff --git a/doc/classes/VisualShaderNodeGroupBase.xml b/modules/visual_shader/doc_classes/VisualShaderNodeGroupBase.xml similarity index 98% rename from doc/classes/VisualShaderNodeGroupBase.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeGroupBase.xml index 838592192c..67f29c5dd4 100644 --- a/doc/classes/VisualShaderNodeGroupBase.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeGroupBase.xml @@ -1,5 +1,5 @@ - + Base class for a family of nodes with variable number of input and output ports within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeIf.xml b/modules/visual_shader/doc_classes/VisualShaderNodeIf.xml similarity index 93% rename from doc/classes/VisualShaderNodeIf.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeIf.xml index dc628c60b7..5d7d92cf10 100644 --- a/doc/classes/VisualShaderNodeIf.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeIf.xml @@ -1,5 +1,5 @@ - + Outputs a 3D vector based on the result of a floating-point comparison within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeInput.xml b/modules/visual_shader/doc_classes/VisualShaderNodeInput.xml similarity index 95% rename from doc/classes/VisualShaderNodeInput.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeInput.xml index 055f5d91ce..8e85c784e1 100644 --- a/doc/classes/VisualShaderNodeInput.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeInput.xml @@ -1,5 +1,5 @@ - + Represents the input shader parameter within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeIntConstant.xml b/modules/visual_shader/doc_classes/VisualShaderNodeIntConstant.xml similarity index 88% rename from doc/classes/VisualShaderNodeIntConstant.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeIntConstant.xml index d2d9e06be2..6f1904ab27 100644 --- a/doc/classes/VisualShaderNodeIntConstant.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeIntConstant.xml @@ -1,5 +1,5 @@ - + A scalar integer constant to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeIntFunc.xml b/modules/visual_shader/doc_classes/VisualShaderNodeIntFunc.xml similarity index 95% rename from doc/classes/VisualShaderNodeIntFunc.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeIntFunc.xml index 4919237b17..39d5f4a832 100644 --- a/doc/classes/VisualShaderNodeIntFunc.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeIntFunc.xml @@ -1,5 +1,5 @@ - + A scalar integer function to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeIntOp.xml b/modules/visual_shader/doc_classes/VisualShaderNodeIntOp.xml similarity index 97% rename from doc/classes/VisualShaderNodeIntOp.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeIntOp.xml index 66ff83ac11..dc4171c869 100644 --- a/doc/classes/VisualShaderNodeIntOp.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeIntOp.xml @@ -1,5 +1,5 @@ - + An integer scalar operator to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeIntParameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeIntParameter.xml similarity index 97% rename from doc/classes/VisualShaderNodeIntParameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeIntParameter.xml index d0ee8f1eb2..ffc61ea97c 100644 --- a/doc/classes/VisualShaderNodeIntParameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeIntParameter.xml @@ -1,5 +1,5 @@ - + A visual shader node for shader parameter (uniform) of type [int]. diff --git a/doc/classes/VisualShaderNodeIs.xml b/modules/visual_shader/doc_classes/VisualShaderNodeIs.xml similarity index 94% rename from doc/classes/VisualShaderNodeIs.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeIs.xml index 208924edff..b90a32ca33 100644 --- a/doc/classes/VisualShaderNodeIs.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeIs.xml @@ -1,5 +1,5 @@ - + A boolean comparison operator to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeLinearSceneDepth.xml b/modules/visual_shader/doc_classes/VisualShaderNodeLinearSceneDepth.xml similarity index 85% rename from doc/classes/VisualShaderNodeLinearSceneDepth.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeLinearSceneDepth.xml index 0f7cdfa339..eddc253997 100644 --- a/doc/classes/VisualShaderNodeLinearSceneDepth.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeLinearSceneDepth.xml @@ -1,5 +1,5 @@ - + A visual shader node that returns the depth value of the DEPTH_TEXTURE node in a linear space. diff --git a/doc/classes/VisualShaderNodeMix.xml b/modules/visual_shader/doc_classes/VisualShaderNodeMix.xml similarity index 96% rename from doc/classes/VisualShaderNodeMix.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeMix.xml index 5b8a70f466..a52ea1ab95 100644 --- a/doc/classes/VisualShaderNodeMix.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeMix.xml @@ -1,5 +1,5 @@ - + Linearly interpolates between two values within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeMultiplyAdd.xml b/modules/visual_shader/doc_classes/VisualShaderNodeMultiplyAdd.xml similarity index 94% rename from doc/classes/VisualShaderNodeMultiplyAdd.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeMultiplyAdd.xml index a539c5a1c1..e769c6906a 100644 --- a/doc/classes/VisualShaderNodeMultiplyAdd.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeMultiplyAdd.xml @@ -1,5 +1,5 @@ - + Performs a fused multiply-add operation within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeOuterProduct.xml b/modules/visual_shader/doc_classes/VisualShaderNodeOuterProduct.xml similarity index 91% rename from doc/classes/VisualShaderNodeOuterProduct.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeOuterProduct.xml index f9bdc88f50..c877c299be 100644 --- a/doc/classes/VisualShaderNodeOuterProduct.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeOuterProduct.xml @@ -1,5 +1,5 @@ - + Calculates an outer product of two vectors within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeOutput.xml b/modules/visual_shader/doc_classes/VisualShaderNodeOutput.xml similarity index 88% rename from doc/classes/VisualShaderNodeOutput.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeOutput.xml index 915100dec5..8da248c188 100644 --- a/doc/classes/VisualShaderNodeOutput.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeOutput.xml @@ -1,5 +1,5 @@ - + Represents the output shader parameters within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeParameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParameter.xml similarity index 96% rename from doc/classes/VisualShaderNodeParameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParameter.xml index ef84792cd6..516a7de5cf 100644 --- a/doc/classes/VisualShaderNodeParameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParameter.xml @@ -1,5 +1,5 @@ - + A base type for the parameters within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeParameterRef.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParameterRef.xml similarity index 91% rename from doc/classes/VisualShaderNodeParameterRef.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParameterRef.xml index 7f2b323b61..f7b1dad993 100644 --- a/doc/classes/VisualShaderNodeParameterRef.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParameterRef.xml @@ -1,5 +1,5 @@ - + A reference to an existing [VisualShaderNodeParameter]. diff --git a/doc/classes/VisualShaderNodeParticleAccelerator.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParticleAccelerator.xml similarity index 94% rename from doc/classes/VisualShaderNodeParticleAccelerator.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParticleAccelerator.xml index b5dad463b9..13b52b6c41 100644 --- a/doc/classes/VisualShaderNodeParticleAccelerator.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParticleAccelerator.xml @@ -1,5 +1,5 @@ - + A visual shader node that accelerates particles. diff --git a/doc/classes/VisualShaderNodeParticleBoxEmitter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParticleBoxEmitter.xml similarity index 95% rename from doc/classes/VisualShaderNodeParticleBoxEmitter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParticleBoxEmitter.xml index d0d0028ed9..9973ee24d3 100644 --- a/doc/classes/VisualShaderNodeParticleBoxEmitter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParticleBoxEmitter.xml @@ -1,5 +1,5 @@ - + A visual shader node that makes particles emitted in a box shape. diff --git a/doc/classes/VisualShaderNodeParticleConeVelocity.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParticleConeVelocity.xml similarity index 87% rename from doc/classes/VisualShaderNodeParticleConeVelocity.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParticleConeVelocity.xml index 23aa4f5787..8b2396cc2d 100644 --- a/doc/classes/VisualShaderNodeParticleConeVelocity.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParticleConeVelocity.xml @@ -1,5 +1,5 @@ - + A visual shader node that makes particles move in a cone shape. diff --git a/doc/classes/VisualShaderNodeParticleEmit.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParticleEmit.xml similarity index 96% rename from doc/classes/VisualShaderNodeParticleEmit.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParticleEmit.xml index 9be62bb0a4..1b5615e1a6 100644 --- a/doc/classes/VisualShaderNodeParticleEmit.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParticleEmit.xml @@ -1,5 +1,5 @@ - + A visual shader node that forces to emit a particle from a sub-emitter. diff --git a/doc/classes/VisualShaderNodeParticleEmitter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParticleEmitter.xml similarity index 91% rename from doc/classes/VisualShaderNodeParticleEmitter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParticleEmitter.xml index 9771b55489..75e594aca7 100644 --- a/doc/classes/VisualShaderNodeParticleEmitter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParticleEmitter.xml @@ -1,5 +1,5 @@ - + A base class for particle emitters. diff --git a/doc/classes/VisualShaderNodeParticleMeshEmitter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParticleMeshEmitter.xml similarity index 97% rename from doc/classes/VisualShaderNodeParticleMeshEmitter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParticleMeshEmitter.xml index 0203ce0313..0643dadbca 100644 --- a/doc/classes/VisualShaderNodeParticleMeshEmitter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParticleMeshEmitter.xml @@ -1,5 +1,5 @@ - + A visual shader node that makes particles emitted in a shape defined by a [Mesh]. diff --git a/doc/classes/VisualShaderNodeParticleMultiplyByAxisAngle.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParticleMultiplyByAxisAngle.xml similarity index 89% rename from doc/classes/VisualShaderNodeParticleMultiplyByAxisAngle.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParticleMultiplyByAxisAngle.xml index 035f29442d..cb21589263 100644 --- a/doc/classes/VisualShaderNodeParticleMultiplyByAxisAngle.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParticleMultiplyByAxisAngle.xml @@ -1,5 +1,5 @@ - + A visual shader helper node for multiplying position and rotation of particles. diff --git a/doc/classes/VisualShaderNodeParticleOutput.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParticleOutput.xml similarity index 88% rename from doc/classes/VisualShaderNodeParticleOutput.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParticleOutput.xml index 93ea204d3a..73c19dbfbf 100644 --- a/doc/classes/VisualShaderNodeParticleOutput.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParticleOutput.xml @@ -1,5 +1,5 @@ - + Visual shader node that defines output values for particle emitting. diff --git a/doc/classes/VisualShaderNodeParticleRandomness.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParticleRandomness.xml similarity index 94% rename from doc/classes/VisualShaderNodeParticleRandomness.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParticleRandomness.xml index 97bb8704db..1a2eb0df7b 100644 --- a/doc/classes/VisualShaderNodeParticleRandomness.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParticleRandomness.xml @@ -1,5 +1,5 @@ - + Visual shader node for randomizing particle values. diff --git a/doc/classes/VisualShaderNodeParticleRingEmitter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParticleRingEmitter.xml similarity index 95% rename from doc/classes/VisualShaderNodeParticleRingEmitter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParticleRingEmitter.xml index fbe8dc29a7..bf268b9dd6 100644 --- a/doc/classes/VisualShaderNodeParticleRingEmitter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParticleRingEmitter.xml @@ -1,5 +1,5 @@ - + A visual shader node that makes particles emitted in a ring shape. diff --git a/doc/classes/VisualShaderNodeParticleSphereEmitter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeParticleSphereEmitter.xml similarity index 94% rename from doc/classes/VisualShaderNodeParticleSphereEmitter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeParticleSphereEmitter.xml index 4903e05949..c5c8b2362d 100644 --- a/doc/classes/VisualShaderNodeParticleSphereEmitter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeParticleSphereEmitter.xml @@ -1,5 +1,5 @@ - + A visual shader node that makes particles emitted in a sphere shape. diff --git a/doc/classes/VisualShaderNodeProximityFade.xml b/modules/visual_shader/doc_classes/VisualShaderNodeProximityFade.xml similarity index 85% rename from doc/classes/VisualShaderNodeProximityFade.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeProximityFade.xml index dd07ba4797..bd13c427c9 100644 --- a/doc/classes/VisualShaderNodeProximityFade.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeProximityFade.xml @@ -1,5 +1,5 @@ - + A visual shader node representing proximity fade effect. diff --git a/doc/classes/VisualShaderNodeRandomRange.xml b/modules/visual_shader/doc_classes/VisualShaderNodeRandomRange.xml similarity index 89% rename from doc/classes/VisualShaderNodeRandomRange.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeRandomRange.xml index fb87c9eed0..02f10311e2 100644 --- a/doc/classes/VisualShaderNodeRandomRange.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeRandomRange.xml @@ -1,5 +1,5 @@ - + A visual shader node that generates a pseudo-random scalar. diff --git a/doc/classes/VisualShaderNodeRemap.xml b/modules/visual_shader/doc_classes/VisualShaderNodeRemap.xml similarity index 97% rename from doc/classes/VisualShaderNodeRemap.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeRemap.xml index 370adf5cf2..65042e7bb9 100644 --- a/doc/classes/VisualShaderNodeRemap.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeRemap.xml @@ -1,5 +1,5 @@ - + A visual shader node for remap function. diff --git a/doc/classes/VisualShaderNodeReroute.xml b/modules/visual_shader/doc_classes/VisualShaderNodeReroute.xml similarity index 91% rename from doc/classes/VisualShaderNodeReroute.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeReroute.xml index c11aefc42e..63a085053b 100644 --- a/doc/classes/VisualShaderNodeReroute.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeReroute.xml @@ -1,5 +1,5 @@ - + A node that allows rerouting a connection within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeResizableBase.xml b/modules/visual_shader/doc_classes/VisualShaderNodeResizableBase.xml similarity index 89% rename from doc/classes/VisualShaderNodeResizableBase.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeResizableBase.xml index 9259736cdd..29cf96aa4b 100644 --- a/doc/classes/VisualShaderNodeResizableBase.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeResizableBase.xml @@ -1,5 +1,5 @@ - + Base class for resizable nodes in a visual shader graph. diff --git a/doc/classes/VisualShaderNodeRotationByAxis.xml b/modules/visual_shader/doc_classes/VisualShaderNodeRotationByAxis.xml similarity index 88% rename from doc/classes/VisualShaderNodeRotationByAxis.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeRotationByAxis.xml index ff714f9858..c120e112a3 100644 --- a/doc/classes/VisualShaderNodeRotationByAxis.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeRotationByAxis.xml @@ -1,5 +1,5 @@ - + A visual shader node that modifies the rotation of the object using a rotation matrix. diff --git a/doc/classes/VisualShaderNodeSDFRaymarch.xml b/modules/visual_shader/doc_classes/VisualShaderNodeSDFRaymarch.xml similarity index 86% rename from doc/classes/VisualShaderNodeSDFRaymarch.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeSDFRaymarch.xml index 1b90ea284f..0249fa6096 100644 --- a/doc/classes/VisualShaderNodeSDFRaymarch.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeSDFRaymarch.xml @@ -1,5 +1,5 @@ - + SDF raymarching algorithm to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeSDFToScreenUV.xml b/modules/visual_shader/doc_classes/VisualShaderNodeSDFToScreenUV.xml similarity index 87% rename from doc/classes/VisualShaderNodeSDFToScreenUV.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeSDFToScreenUV.xml index 24da65d793..867f720715 100644 --- a/doc/classes/VisualShaderNodeSDFToScreenUV.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeSDFToScreenUV.xml @@ -1,5 +1,5 @@ - + A function to convert an SDF (signed-distance field) to screen UV, to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeSample3D.xml b/modules/visual_shader/doc_classes/VisualShaderNodeSample3D.xml similarity index 93% rename from doc/classes/VisualShaderNodeSample3D.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeSample3D.xml index e51abbf473..cd7a31c424 100644 --- a/doc/classes/VisualShaderNodeSample3D.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeSample3D.xml @@ -1,5 +1,5 @@ - + A base node for nodes which samples 3D textures in the visual shader graph. diff --git a/doc/classes/VisualShaderNodeScreenNormalWorldSpace.xml b/modules/visual_shader/doc_classes/VisualShaderNodeScreenNormalWorldSpace.xml similarity index 84% rename from doc/classes/VisualShaderNodeScreenNormalWorldSpace.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeScreenNormalWorldSpace.xml index 30e298566a..54f7ee104c 100644 --- a/doc/classes/VisualShaderNodeScreenNormalWorldSpace.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeScreenNormalWorldSpace.xml @@ -1,5 +1,5 @@ - + A visual shader node that unpacks the screen normal texture in World Space. diff --git a/doc/classes/VisualShaderNodeScreenUVToSDF.xml b/modules/visual_shader/doc_classes/VisualShaderNodeScreenUVToSDF.xml similarity index 88% rename from doc/classes/VisualShaderNodeScreenUVToSDF.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeScreenUVToSDF.xml index 99c1bd6ea5..a9762e3021 100644 --- a/doc/classes/VisualShaderNodeScreenUVToSDF.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeScreenUVToSDF.xml @@ -1,5 +1,5 @@ - + A function to convert screen UV to an SDF (signed-distance field), to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeSmoothStep.xml b/modules/visual_shader/doc_classes/VisualShaderNodeSmoothStep.xml similarity index 96% rename from doc/classes/VisualShaderNodeSmoothStep.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeSmoothStep.xml index e5c27095fd..f8bcb73b8a 100644 --- a/doc/classes/VisualShaderNodeSmoothStep.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeSmoothStep.xml @@ -1,5 +1,5 @@ - + Calculates a SmoothStep function within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeStep.xml b/modules/visual_shader/doc_classes/VisualShaderNodeStep.xml similarity index 96% rename from doc/classes/VisualShaderNodeStep.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeStep.xml index b35b8c8f15..43bb975ae7 100644 --- a/doc/classes/VisualShaderNodeStep.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeStep.xml @@ -1,5 +1,5 @@ - + Calculates a Step function within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeSwitch.xml b/modules/visual_shader/doc_classes/VisualShaderNodeSwitch.xml similarity index 96% rename from doc/classes/VisualShaderNodeSwitch.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeSwitch.xml index 9fc0490653..d7ece6f695 100644 --- a/doc/classes/VisualShaderNodeSwitch.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeSwitch.xml @@ -1,5 +1,5 @@ - + A selector function for use within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTexture.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTexture.xml similarity index 98% rename from doc/classes/VisualShaderNodeTexture.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTexture.xml index ccb930626e..d8bb6f7c84 100644 --- a/doc/classes/VisualShaderNodeTexture.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTexture.xml @@ -1,5 +1,5 @@ - + Performs a 2D texture lookup within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTexture2DArray.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTexture2DArray.xml similarity index 89% rename from doc/classes/VisualShaderNodeTexture2DArray.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTexture2DArray.xml index 88347ff43f..9d3d2c60e3 100644 --- a/doc/classes/VisualShaderNodeTexture2DArray.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTexture2DArray.xml @@ -1,5 +1,5 @@ - + A 2D texture uniform array to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTexture2DArrayParameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTexture2DArrayParameter.xml similarity index 94% rename from doc/classes/VisualShaderNodeTexture2DArrayParameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTexture2DArrayParameter.xml index d74151ef9f..92e77d5482 100644 --- a/doc/classes/VisualShaderNodeTexture2DArrayParameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTexture2DArrayParameter.xml @@ -1,5 +1,5 @@ - + A visual shader node for shader parameter (uniform) of type [Texture2DArray]. diff --git a/doc/classes/VisualShaderNodeTexture2DParameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTexture2DParameter.xml similarity index 94% rename from doc/classes/VisualShaderNodeTexture2DParameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTexture2DParameter.xml index 71ff1979e6..e3ca987c46 100644 --- a/doc/classes/VisualShaderNodeTexture2DParameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTexture2DParameter.xml @@ -1,5 +1,5 @@ - + Provides a 2D texture parameter within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTexture3D.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTexture3D.xml similarity index 90% rename from doc/classes/VisualShaderNodeTexture3D.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTexture3D.xml index 248a32f3b9..e647bc5e85 100644 --- a/doc/classes/VisualShaderNodeTexture3D.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTexture3D.xml @@ -1,5 +1,5 @@ - + Performs a 3D texture lookup within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTexture3DParameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTexture3DParameter.xml similarity index 94% rename from doc/classes/VisualShaderNodeTexture3DParameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTexture3DParameter.xml index 35c44cee22..16dbcd07ce 100644 --- a/doc/classes/VisualShaderNodeTexture3DParameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTexture3DParameter.xml @@ -1,5 +1,5 @@ - + Provides a 3D texture parameter within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTextureParameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTextureParameter.xml similarity index 98% rename from doc/classes/VisualShaderNodeTextureParameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTextureParameter.xml index 7467dc4890..3a8f25655b 100644 --- a/doc/classes/VisualShaderNodeTextureParameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTextureParameter.xml @@ -1,5 +1,5 @@ - + Performs a uniform texture lookup within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTextureParameterTriplanar.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTextureParameterTriplanar.xml similarity index 94% rename from doc/classes/VisualShaderNodeTextureParameterTriplanar.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTextureParameterTriplanar.xml index b94723d030..b7f4c9a59d 100644 --- a/doc/classes/VisualShaderNodeTextureParameterTriplanar.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTextureParameterTriplanar.xml @@ -1,5 +1,5 @@ - + Performs a uniform texture lookup with triplanar within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTextureSDF.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTextureSDF.xml similarity index 86% rename from doc/classes/VisualShaderNodeTextureSDF.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTextureSDF.xml index 89c7a84212..89f85396ed 100644 --- a/doc/classes/VisualShaderNodeTextureSDF.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTextureSDF.xml @@ -1,5 +1,5 @@ - + Performs an SDF (signed-distance field) texture lookup within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTextureSDFNormal.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTextureSDFNormal.xml similarity index 86% rename from doc/classes/VisualShaderNodeTextureSDFNormal.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTextureSDFNormal.xml index 99ef619e03..c93c659288 100644 --- a/doc/classes/VisualShaderNodeTextureSDFNormal.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTextureSDFNormal.xml @@ -1,5 +1,5 @@ - + Performs an SDF (signed-distance field) normal texture lookup within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTransformCompose.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTransformCompose.xml similarity index 87% rename from doc/classes/VisualShaderNodeTransformCompose.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTransformCompose.xml index 00ac7cc03e..519a67aa39 100644 --- a/doc/classes/VisualShaderNodeTransformCompose.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTransformCompose.xml @@ -1,5 +1,5 @@ - + Composes a [Transform3D] from four [Vector3]s within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTransformConstant.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTransformConstant.xml similarity index 88% rename from doc/classes/VisualShaderNodeTransformConstant.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTransformConstant.xml index 4d5fe487f9..e5795a18ef 100644 --- a/doc/classes/VisualShaderNodeTransformConstant.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTransformConstant.xml @@ -1,5 +1,5 @@ - + A [Transform3D] constant for use within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTransformDecompose.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTransformDecompose.xml similarity index 86% rename from doc/classes/VisualShaderNodeTransformDecompose.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTransformDecompose.xml index 9d8034a791..40690f059c 100644 --- a/doc/classes/VisualShaderNodeTransformDecompose.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTransformDecompose.xml @@ -1,5 +1,5 @@ - + Decomposes a [Transform3D] into four [Vector3]s within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTransformFunc.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTransformFunc.xml similarity index 93% rename from doc/classes/VisualShaderNodeTransformFunc.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTransformFunc.xml index 6f14e22144..7a344414b4 100644 --- a/doc/classes/VisualShaderNodeTransformFunc.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTransformFunc.xml @@ -1,5 +1,5 @@ - + Computes a [Transform3D] function within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTransformOp.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTransformOp.xml similarity index 96% rename from doc/classes/VisualShaderNodeTransformOp.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTransformOp.xml index 10fea606f2..18842c65f1 100644 --- a/doc/classes/VisualShaderNodeTransformOp.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTransformOp.xml @@ -1,5 +1,5 @@ - + A [Transform3D] operator to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTransformParameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTransformParameter.xml similarity index 91% rename from doc/classes/VisualShaderNodeTransformParameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTransformParameter.xml index c5b061550a..82ffee8067 100644 --- a/doc/classes/VisualShaderNodeTransformParameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTransformParameter.xml @@ -1,5 +1,5 @@ - + A [Transform3D] parameter for use within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeTransformVecMult.xml b/modules/visual_shader/doc_classes/VisualShaderNodeTransformVecMult.xml similarity index 95% rename from doc/classes/VisualShaderNodeTransformVecMult.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeTransformVecMult.xml index b8fd8ea59f..84405f4c9d 100644 --- a/doc/classes/VisualShaderNodeTransformVecMult.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeTransformVecMult.xml @@ -1,5 +1,5 @@ - + Multiplies a [Transform3D] and a [Vector3] within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeUIntConstant.xml b/modules/visual_shader/doc_classes/VisualShaderNodeUIntConstant.xml similarity index 88% rename from doc/classes/VisualShaderNodeUIntConstant.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeUIntConstant.xml index 10be47abe6..a0f11453e8 100644 --- a/doc/classes/VisualShaderNodeUIntConstant.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeUIntConstant.xml @@ -1,5 +1,5 @@ - + An unsigned scalar integer constant to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeUIntFunc.xml b/modules/visual_shader/doc_classes/VisualShaderNodeUIntFunc.xml similarity index 94% rename from doc/classes/VisualShaderNodeUIntFunc.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeUIntFunc.xml index 432c604f57..3888d9e9ab 100644 --- a/doc/classes/VisualShaderNodeUIntFunc.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeUIntFunc.xml @@ -1,5 +1,5 @@ - + An unsigned scalar integer function to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeUIntOp.xml b/modules/visual_shader/doc_classes/VisualShaderNodeUIntOp.xml similarity index 97% rename from doc/classes/VisualShaderNodeUIntOp.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeUIntOp.xml index 4d2e66f219..634b31f72d 100644 --- a/doc/classes/VisualShaderNodeUIntOp.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeUIntOp.xml @@ -1,5 +1,5 @@ - + An unsigned integer scalar operator to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeUIntParameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeUIntParameter.xml similarity index 92% rename from doc/classes/VisualShaderNodeUIntParameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeUIntParameter.xml index 387479c1b1..19b408b7ec 100644 --- a/doc/classes/VisualShaderNodeUIntParameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeUIntParameter.xml @@ -1,5 +1,5 @@ - + A visual shader node for shader parameter (uniform) of type unsigned [int]. diff --git a/doc/classes/VisualShaderNodeUVFunc.xml b/modules/visual_shader/doc_classes/VisualShaderNodeUVFunc.xml similarity index 95% rename from doc/classes/VisualShaderNodeUVFunc.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeUVFunc.xml index ab5b447c84..39341a9eae 100644 --- a/doc/classes/VisualShaderNodeUVFunc.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeUVFunc.xml @@ -1,5 +1,5 @@ - + Contains functions to modify texture coordinates ([code]uv[/code]) to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeUVPolarCoord.xml b/modules/visual_shader/doc_classes/VisualShaderNodeUVPolarCoord.xml similarity index 88% rename from doc/classes/VisualShaderNodeUVPolarCoord.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeUVPolarCoord.xml index 4330d31cce..c867764396 100644 --- a/doc/classes/VisualShaderNodeUVPolarCoord.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeUVPolarCoord.xml @@ -1,5 +1,5 @@ - + A visual shader node that modifies the texture UV using polar coordinates. diff --git a/doc/classes/VisualShaderNodeVarying.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVarying.xml similarity index 93% rename from doc/classes/VisualShaderNodeVarying.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVarying.xml index 360674556e..ec257ab46c 100644 --- a/doc/classes/VisualShaderNodeVarying.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVarying.xml @@ -1,5 +1,5 @@ - + A visual shader node that represents a "varying" shader value. diff --git a/doc/classes/VisualShaderNodeVaryingGetter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVaryingGetter.xml similarity index 88% rename from doc/classes/VisualShaderNodeVaryingGetter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVaryingGetter.xml index 0cb27866b9..2467d3574e 100644 --- a/doc/classes/VisualShaderNodeVaryingGetter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVaryingGetter.xml @@ -1,5 +1,5 @@ - + A visual shader node that gets a value of a varying. diff --git a/doc/classes/VisualShaderNodeVaryingSetter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVaryingSetter.xml similarity index 88% rename from doc/classes/VisualShaderNodeVaryingSetter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVaryingSetter.xml index cc06da3d53..87b42d26c8 100644 --- a/doc/classes/VisualShaderNodeVaryingSetter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVaryingSetter.xml @@ -1,5 +1,5 @@ - + A visual shader node that sets a value of a varying. diff --git a/doc/classes/VisualShaderNodeVec2Constant.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVec2Constant.xml similarity index 88% rename from doc/classes/VisualShaderNodeVec2Constant.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVec2Constant.xml index 5c6dd11a11..b10e17a369 100644 --- a/doc/classes/VisualShaderNodeVec2Constant.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVec2Constant.xml @@ -1,5 +1,5 @@ - + A [Vector2] constant to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVec2Parameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVec2Parameter.xml similarity index 91% rename from doc/classes/VisualShaderNodeVec2Parameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVec2Parameter.xml index 14a5e52e2c..08ad9327b2 100644 --- a/doc/classes/VisualShaderNodeVec2Parameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVec2Parameter.xml @@ -1,5 +1,5 @@ - + A [Vector2] parameter to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVec3Constant.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVec3Constant.xml similarity index 88% rename from doc/classes/VisualShaderNodeVec3Constant.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVec3Constant.xml index dc09353a75..f1f62305a6 100644 --- a/doc/classes/VisualShaderNodeVec3Constant.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVec3Constant.xml @@ -1,5 +1,5 @@ - + A [Vector3] constant to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVec3Parameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVec3Parameter.xml similarity index 91% rename from doc/classes/VisualShaderNodeVec3Parameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVec3Parameter.xml index 3f5419bfb0..f80e0b447c 100644 --- a/doc/classes/VisualShaderNodeVec3Parameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVec3Parameter.xml @@ -1,5 +1,5 @@ - + A [Vector3] parameter to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVec4Constant.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVec4Constant.xml similarity index 89% rename from doc/classes/VisualShaderNodeVec4Constant.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVec4Constant.xml index abcd4a4d16..e27db921d0 100644 --- a/doc/classes/VisualShaderNodeVec4Constant.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVec4Constant.xml @@ -1,5 +1,5 @@ - + A 4D vector constant to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVec4Parameter.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVec4Parameter.xml similarity index 91% rename from doc/classes/VisualShaderNodeVec4Parameter.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVec4Parameter.xml index fe42b96012..f7ae1f2e9d 100644 --- a/doc/classes/VisualShaderNodeVec4Parameter.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVec4Parameter.xml @@ -1,5 +1,5 @@ - + A 4D vector parameter to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVectorBase.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVectorBase.xml similarity index 94% rename from doc/classes/VisualShaderNodeVectorBase.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVectorBase.xml index 90db91279d..03759fb2ef 100644 --- a/doc/classes/VisualShaderNodeVectorBase.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVectorBase.xml @@ -1,5 +1,5 @@ - + A base type for the nodes that perform vector operations within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVectorCompose.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVectorCompose.xml similarity index 86% rename from doc/classes/VisualShaderNodeVectorCompose.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVectorCompose.xml index 60ea849383..e71f1c80c8 100644 --- a/doc/classes/VisualShaderNodeVectorCompose.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVectorCompose.xml @@ -1,5 +1,5 @@ - + Composes a [Vector2], [Vector3] or 4D vector (represented as a [Quaternion]) from scalars within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVectorDecompose.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVectorDecompose.xml similarity index 86% rename from doc/classes/VisualShaderNodeVectorDecompose.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVectorDecompose.xml index e8aaeb2d1b..8406ee2685 100644 --- a/doc/classes/VisualShaderNodeVectorDecompose.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVectorDecompose.xml @@ -1,5 +1,5 @@ - + Decomposes a [Vector2], [Vector3] or 4D vector (represented as a [Quaternion]) into scalars within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVectorDistance.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVectorDistance.xml similarity index 86% rename from doc/classes/VisualShaderNodeVectorDistance.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVectorDistance.xml index bfa277678d..f136093b15 100644 --- a/doc/classes/VisualShaderNodeVectorDistance.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVectorDistance.xml @@ -1,5 +1,5 @@ - + Returns the distance between two points. To be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVectorFunc.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVectorFunc.xml similarity index 98% rename from doc/classes/VisualShaderNodeVectorFunc.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVectorFunc.xml index acf47f0bd8..6c95b8fa76 100644 --- a/doc/classes/VisualShaderNodeVectorFunc.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVectorFunc.xml @@ -1,5 +1,5 @@ - + A vector function to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVectorLen.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVectorLen.xml similarity index 84% rename from doc/classes/VisualShaderNodeVectorLen.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVectorLen.xml index 9ac5639504..66709c77f8 100644 --- a/doc/classes/VisualShaderNodeVectorLen.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVectorLen.xml @@ -1,5 +1,5 @@ - + Returns the length of a [Vector3] within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVectorOp.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVectorOp.xml similarity index 96% rename from doc/classes/VisualShaderNodeVectorOp.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVectorOp.xml index 76566c5741..abdcf13eee 100644 --- a/doc/classes/VisualShaderNodeVectorOp.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVectorOp.xml @@ -1,5 +1,5 @@ - + A vector operator to be used within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeVectorRefract.xml b/modules/visual_shader/doc_classes/VisualShaderNodeVectorRefract.xml similarity index 88% rename from doc/classes/VisualShaderNodeVectorRefract.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeVectorRefract.xml index 7581e372b5..2ceb8e0b6a 100644 --- a/doc/classes/VisualShaderNodeVectorRefract.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeVectorRefract.xml @@ -1,5 +1,5 @@ - + Returns the vector that points in the direction of refraction. For use within the visual shader graph. diff --git a/doc/classes/VisualShaderNodeWorldPositionFromDepth.xml b/modules/visual_shader/doc_classes/VisualShaderNodeWorldPositionFromDepth.xml similarity index 87% rename from doc/classes/VisualShaderNodeWorldPositionFromDepth.xml rename to modules/visual_shader/doc_classes/VisualShaderNodeWorldPositionFromDepth.xml index 94c2bf8a3b..75cd8be77d 100644 --- a/doc/classes/VisualShaderNodeWorldPositionFromDepth.xml +++ b/modules/visual_shader/doc_classes/VisualShaderNodeWorldPositionFromDepth.xml @@ -1,5 +1,5 @@ - + A visual shader node that calculates the position of the pixel in world space using the depth texture. diff --git a/editor/shader/visual_shader_editor_plugin.cpp b/modules/visual_shader/editor/visual_shader_editor_plugin.cpp similarity index 99% rename from editor/shader/visual_shader_editor_plugin.cpp rename to modules/visual_shader/editor/visual_shader_editor_plugin.cpp index b194b50d45..5f591bb0b3 100644 --- a/editor/shader/visual_shader_editor_plugin.cpp +++ b/modules/visual_shader/editor/visual_shader_editor_plugin.cpp @@ -76,13 +76,14 @@ #include "scene/resources/curve_texture.h" #include "scene/resources/sky.h" #include "scene/resources/style_box_flat.h" -#include "scene/resources/visual_shader_nodes.h" -#include "scene/resources/visual_shader_particle_nodes.h" #include "servers/display/display_server.h" #include "servers/rendering/rendering_server.h" #include "servers/rendering/shader_preprocessor.h" #include "servers/rendering/shader_types.h" +#include "modules/visual_shader/vs_nodes/visual_shader_nodes.h" +#include "modules/visual_shader/vs_nodes/visual_shader_particle_nodes.h" + struct FloatConstantDef { String name; float value = 0; diff --git a/editor/shader/visual_shader_editor_plugin.h b/modules/visual_shader/editor/visual_shader_editor_plugin.h similarity index 99% rename from editor/shader/visual_shader_editor_plugin.h rename to modules/visual_shader/editor/visual_shader_editor_plugin.h index a094714a32..f31d8de44f 100644 --- a/editor/shader/visual_shader_editor_plugin.h +++ b/modules/visual_shader/editor/visual_shader_editor_plugin.h @@ -37,7 +37,8 @@ #include "scene/gui/graph_edit.h" #include "scene/resources/material.h" #include "scene/resources/syntax_highlighter.h" -#include "scene/resources/visual_shader.h" + +#include "modules/visual_shader/visual_shader.h" class CodeEdit; class ColorPicker; diff --git a/editor/shader/visual_shader_language_plugin.cpp b/modules/visual_shader/editor/visual_shader_language_plugin.cpp similarity index 98% rename from editor/shader/visual_shader_language_plugin.cpp rename to modules/visual_shader/editor/visual_shader_language_plugin.cpp index 7283fc5646..2d4d86977c 100644 --- a/editor/shader/visual_shader_language_plugin.cpp +++ b/modules/visual_shader/editor/visual_shader_language_plugin.cpp @@ -30,7 +30,7 @@ #include "visual_shader_language_plugin.h" -#include "editor/shader/visual_shader_editor_plugin.h" +#include "visual_shader_editor_plugin.h" bool VisualShaderLanguagePlugin::handles_shader(const Ref &p_shader) const { return Object::cast_to(p_shader.ptr()) != nullptr; diff --git a/editor/shader/visual_shader_language_plugin.h b/modules/visual_shader/editor/visual_shader_language_plugin.h similarity index 100% rename from editor/shader/visual_shader_language_plugin.h rename to modules/visual_shader/editor/visual_shader_language_plugin.h diff --git a/modules/visual_shader/register_types.cpp b/modules/visual_shader/register_types.cpp new file mode 100644 index 0000000000..6f26143e9e --- /dev/null +++ b/modules/visual_shader/register_types.cpp @@ -0,0 +1,185 @@ +/**************************************************************************/ +/* register_types.cpp */ +/**************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/**************************************************************************/ +/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ +/* 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 "register_types.h" + +#include "visual_shader.h" +#include "vs_nodes/visual_shader_nodes.h" +#include "vs_nodes/visual_shader_particle_nodes.h" +#include "vs_nodes/visual_shader_sdf_nodes.h" + +#include "core/object/class_db.h" + +#ifdef TOOLS_ENABLED +#include "editor/editor_node.h" +#include "editor/visual_shader_editor_plugin.h" +#include "editor/visual_shader_language_plugin.h" + +static void _editor_init() { + Ref visual_shader_mode_plugin; + visual_shader_mode_plugin.instantiate(); + EditorInspector::add_inspector_plugin(visual_shader_mode_plugin); + + Ref visual_shader_convert; + visual_shader_convert.instantiate(); + EditorNode::get_singleton()->add_resource_conversion_plugin(visual_shader_convert); + + Ref visual_shader_lang; + visual_shader_lang.instantiate(); + EditorShaderLanguagePlugin::register_shader_language(visual_shader_lang); +} +#endif // TOOLS_ENABLED + +void initialize_visual_shader_module(ModuleInitializationLevel p_level) { + if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) { + GDREGISTER_CLASS(VisualShader); + GDREGISTER_ABSTRACT_CLASS(VisualShaderNode); + GDREGISTER_CLASS(VisualShaderNodeCustom); + GDREGISTER_CLASS(VisualShaderNodeInput); + GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeOutput); + GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeResizableBase); + GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeGroupBase); + GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeConstant); + GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeVectorBase); + GDREGISTER_CLASS(VisualShaderNodeFrame); +#ifndef DISABLE_DEPRECATED + GDREGISTER_CLASS(VisualShaderNodeComment); // Deprecated, just for compatibility. +#endif + GDREGISTER_CLASS(VisualShaderNodeFloatConstant); + GDREGISTER_CLASS(VisualShaderNodeIntConstant); + GDREGISTER_CLASS(VisualShaderNodeUIntConstant); + GDREGISTER_CLASS(VisualShaderNodeBooleanConstant); + GDREGISTER_CLASS(VisualShaderNodeColorConstant); + GDREGISTER_CLASS(VisualShaderNodeVec2Constant); + GDREGISTER_CLASS(VisualShaderNodeVec3Constant); + GDREGISTER_CLASS(VisualShaderNodeVec4Constant); + GDREGISTER_CLASS(VisualShaderNodeTransformConstant); + GDREGISTER_CLASS(VisualShaderNodeFloatOp); + GDREGISTER_CLASS(VisualShaderNodeIntOp); + GDREGISTER_CLASS(VisualShaderNodeUIntOp); + GDREGISTER_CLASS(VisualShaderNodeVectorOp); + GDREGISTER_CLASS(VisualShaderNodeColorOp); + GDREGISTER_CLASS(VisualShaderNodeTransformOp); + GDREGISTER_CLASS(VisualShaderNodeTransformVecMult); + GDREGISTER_CLASS(VisualShaderNodeFloatFunc); + GDREGISTER_CLASS(VisualShaderNodeIntFunc); + GDREGISTER_CLASS(VisualShaderNodeUIntFunc); + GDREGISTER_CLASS(VisualShaderNodeVectorFunc); + GDREGISTER_CLASS(VisualShaderNodeColorFunc); + GDREGISTER_CLASS(VisualShaderNodeTransformFunc); + GDREGISTER_CLASS(VisualShaderNodeUVFunc); + GDREGISTER_CLASS(VisualShaderNodeUVPolarCoord); + GDREGISTER_CLASS(VisualShaderNodeDotProduct); + GDREGISTER_CLASS(VisualShaderNodeVectorLen); + GDREGISTER_CLASS(VisualShaderNodeDeterminant); + GDREGISTER_CLASS(VisualShaderNodeDerivativeFunc); + GDREGISTER_CLASS(VisualShaderNodeClamp); + GDREGISTER_CLASS(VisualShaderNodeFaceForward); + GDREGISTER_CLASS(VisualShaderNodeOuterProduct); + GDREGISTER_CLASS(VisualShaderNodeSmoothStep); + GDREGISTER_CLASS(VisualShaderNodeStep); + GDREGISTER_CLASS(VisualShaderNodeVectorDistance); + GDREGISTER_CLASS(VisualShaderNodeVectorRefract); + GDREGISTER_CLASS(VisualShaderNodeMix); + GDREGISTER_CLASS(VisualShaderNodeVectorCompose); + GDREGISTER_CLASS(VisualShaderNodeTransformCompose); + GDREGISTER_CLASS(VisualShaderNodeVectorDecompose); + GDREGISTER_CLASS(VisualShaderNodeTransformDecompose); + GDREGISTER_CLASS(VisualShaderNodeTexture); + GDREGISTER_CLASS(VisualShaderNodeCurveTexture); + GDREGISTER_CLASS(VisualShaderNodeCurveXYZTexture); + GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeSample3D); + GDREGISTER_CLASS(VisualShaderNodeTexture2DArray); + GDREGISTER_CLASS(VisualShaderNodeTexture3D); + GDREGISTER_CLASS(VisualShaderNodeCubemap); + GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeParameter); + GDREGISTER_CLASS(VisualShaderNodeParameterRef); + GDREGISTER_CLASS(VisualShaderNodeFloatParameter); + GDREGISTER_CLASS(VisualShaderNodeIntParameter); + GDREGISTER_CLASS(VisualShaderNodeUIntParameter); + GDREGISTER_CLASS(VisualShaderNodeBooleanParameter); + GDREGISTER_CLASS(VisualShaderNodeColorParameter); + GDREGISTER_CLASS(VisualShaderNodeVec2Parameter); + GDREGISTER_CLASS(VisualShaderNodeVec3Parameter); + GDREGISTER_CLASS(VisualShaderNodeVec4Parameter); + GDREGISTER_CLASS(VisualShaderNodeTransformParameter); + GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeTextureParameter); + GDREGISTER_CLASS(VisualShaderNodeTexture2DParameter); + GDREGISTER_CLASS(VisualShaderNodeTextureParameterTriplanar); + GDREGISTER_CLASS(VisualShaderNodeTexture2DArrayParameter); + GDREGISTER_CLASS(VisualShaderNodeTexture3DParameter); + GDREGISTER_CLASS(VisualShaderNodeCubemapParameter); + GDREGISTER_CLASS(VisualShaderNodeLinearSceneDepth); + GDREGISTER_CLASS(VisualShaderNodeWorldPositionFromDepth); + GDREGISTER_CLASS(VisualShaderNodeScreenNormalWorldSpace); + GDREGISTER_CLASS(VisualShaderNodeIf); + GDREGISTER_CLASS(VisualShaderNodeSwitch); + GDREGISTER_CLASS(VisualShaderNodeFresnel); + GDREGISTER_CLASS(VisualShaderNodeExpression); + GDREGISTER_CLASS(VisualShaderNodeGlobalExpression); + GDREGISTER_CLASS(VisualShaderNodeIs); + GDREGISTER_CLASS(VisualShaderNodeCompare); + GDREGISTER_CLASS(VisualShaderNodeMultiplyAdd); + GDREGISTER_CLASS(VisualShaderNodeBillboard); + GDREGISTER_CLASS(VisualShaderNodeDistanceFade); + GDREGISTER_CLASS(VisualShaderNodeProximityFade); + GDREGISTER_CLASS(VisualShaderNodeRandomRange); + GDREGISTER_CLASS(VisualShaderNodeRemap); + GDREGISTER_CLASS(VisualShaderNodeRotationByAxis); + GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeVarying); + GDREGISTER_CLASS(VisualShaderNodeVaryingSetter); + GDREGISTER_CLASS(VisualShaderNodeVaryingGetter); + GDREGISTER_CLASS(VisualShaderNodeReroute); + + GDREGISTER_CLASS(VisualShaderNodeSDFToScreenUV); + GDREGISTER_CLASS(VisualShaderNodeScreenUVToSDF); + GDREGISTER_CLASS(VisualShaderNodeTextureSDF); + GDREGISTER_CLASS(VisualShaderNodeTextureSDFNormal); + GDREGISTER_CLASS(VisualShaderNodeSDFRaymarch); + + GDREGISTER_CLASS(VisualShaderNodeParticleOutput); + GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeParticleEmitter); + GDREGISTER_CLASS(VisualShaderNodeParticleSphereEmitter); + GDREGISTER_CLASS(VisualShaderNodeParticleBoxEmitter); + GDREGISTER_CLASS(VisualShaderNodeParticleRingEmitter); + GDREGISTER_CLASS(VisualShaderNodeParticleMeshEmitter); + GDREGISTER_CLASS(VisualShaderNodeParticleMultiplyByAxisAngle); + GDREGISTER_CLASS(VisualShaderNodeParticleConeVelocity); + GDREGISTER_CLASS(VisualShaderNodeParticleRandomness); + GDREGISTER_CLASS(VisualShaderNodeParticleAccelerator); + GDREGISTER_CLASS(VisualShaderNodeParticleEmit); +#ifdef TOOLS_ENABLED + } else if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) { + EditorNode::add_init_callback(_editor_init); +#endif // TOOLS_ENABLED + } +} + +void uninitialize_visual_shader_module(ModuleInitializationLevel p_level) {} diff --git a/modules/visual_shader/register_types.h b/modules/visual_shader/register_types.h new file mode 100644 index 0000000000..2c38642f50 --- /dev/null +++ b/modules/visual_shader/register_types.h @@ -0,0 +1,36 @@ +/**************************************************************************/ +/* register_types.h */ +/**************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/**************************************************************************/ +/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ +/* 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. */ +/**************************************************************************/ + +#pragma once + +#include "modules/register_module_types.h" + +void initialize_visual_shader_module(ModuleInitializationLevel p_level); +void uninitialize_visual_shader_module(ModuleInitializationLevel p_level); diff --git a/tests/scene/test_visual_shader.cpp b/modules/visual_shader/tests/test_visual_shader.cpp similarity index 99% rename from tests/scene/test_visual_shader.cpp rename to modules/visual_shader/tests/test_visual_shader.cpp index 98816e5ddc..1acdf37470 100644 --- a/tests/scene/test_visual_shader.cpp +++ b/modules/visual_shader/tests/test_visual_shader.cpp @@ -32,7 +32,7 @@ TEST_FORCE_LINK(test_visual_shader) -#include "scene/resources/visual_shader.h" +#include "modules/visual_shader/visual_shader.h" namespace TestVisualShader { diff --git a/scene/resources/visual_shader.cpp b/modules/visual_shader/visual_shader.cpp similarity index 99% rename from scene/resources/visual_shader.cpp rename to modules/visual_shader/visual_shader.cpp index cb5f283f64..768613598d 100644 --- a/scene/resources/visual_shader.cpp +++ b/modules/visual_shader/visual_shader.cpp @@ -30,13 +30,14 @@ #include "visual_shader.h" +#include "vs_nodes/visual_shader_nodes.h" +#include "vs_nodes/visual_shader_particle_nodes.h" + #include "core/config/engine.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "core/templates/rb_map.h" #include "core/variant/variant_utility.h" -#include "scene/resources/visual_shader_nodes.h" -#include "scene/resources/visual_shader_particle_nodes.h" #include "servers/rendering/rendering_server.h" #include "servers/rendering/shader_types.h" diff --git a/scene/resources/visual_shader.h b/modules/visual_shader/visual_shader.h similarity index 100% rename from scene/resources/visual_shader.h rename to modules/visual_shader/visual_shader.h diff --git a/scene/resources/visual_shader_nodes.compat.inc b/modules/visual_shader/vs_nodes/visual_shader_nodes.compat.inc similarity index 100% rename from scene/resources/visual_shader_nodes.compat.inc rename to modules/visual_shader/vs_nodes/visual_shader_nodes.compat.inc diff --git a/scene/resources/visual_shader_nodes.cpp b/modules/visual_shader/vs_nodes/visual_shader_nodes.cpp similarity index 100% rename from scene/resources/visual_shader_nodes.cpp rename to modules/visual_shader/vs_nodes/visual_shader_nodes.cpp diff --git a/scene/resources/visual_shader_nodes.h b/modules/visual_shader/vs_nodes/visual_shader_nodes.h similarity index 99% rename from scene/resources/visual_shader_nodes.h rename to modules/visual_shader/vs_nodes/visual_shader_nodes.h index 5096503f03..11ffe5971a 100644 --- a/scene/resources/visual_shader_nodes.h +++ b/modules/visual_shader/vs_nodes/visual_shader_nodes.h @@ -31,7 +31,8 @@ #pragma once #include "scene/resources/curve_texture.h" -#include "scene/resources/visual_shader.h" + +#include "modules/visual_shader/visual_shader.h" class Cubemap; class Texture2DArray; diff --git a/scene/resources/visual_shader_particle_nodes.cpp b/modules/visual_shader/vs_nodes/visual_shader_particle_nodes.cpp similarity index 100% rename from scene/resources/visual_shader_particle_nodes.cpp rename to modules/visual_shader/vs_nodes/visual_shader_particle_nodes.cpp diff --git a/scene/resources/visual_shader_particle_nodes.h b/modules/visual_shader/vs_nodes/visual_shader_particle_nodes.h similarity index 99% rename from scene/resources/visual_shader_particle_nodes.h rename to modules/visual_shader/vs_nodes/visual_shader_particle_nodes.h index 7280a84034..dd57f59bc5 100644 --- a/scene/resources/visual_shader_particle_nodes.h +++ b/modules/visual_shader/vs_nodes/visual_shader_particle_nodes.h @@ -30,7 +30,7 @@ #pragma once -#include "scene/resources/visual_shader.h" +#include "modules/visual_shader/visual_shader.h" class ImageTexture; diff --git a/scene/resources/visual_shader_sdf_nodes.cpp b/modules/visual_shader/vs_nodes/visual_shader_sdf_nodes.cpp similarity index 100% rename from scene/resources/visual_shader_sdf_nodes.cpp rename to modules/visual_shader/vs_nodes/visual_shader_sdf_nodes.cpp diff --git a/scene/resources/visual_shader_sdf_nodes.h b/modules/visual_shader/vs_nodes/visual_shader_sdf_nodes.h similarity index 99% rename from scene/resources/visual_shader_sdf_nodes.h rename to modules/visual_shader/vs_nodes/visual_shader_sdf_nodes.h index d4618621ef..b8047fffef 100644 --- a/scene/resources/visual_shader_sdf_nodes.h +++ b/modules/visual_shader/vs_nodes/visual_shader_sdf_nodes.h @@ -30,7 +30,7 @@ #pragma once -#include "scene/resources/visual_shader.h" +#include "modules/visual_shader/visual_shader.h" class VisualShaderNodeSDFToScreenUV : public VisualShaderNode { GDCLASS(VisualShaderNodeSDFToScreenUV, VisualShaderNode); diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 9d3424e885..3dcc49b46a 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -165,10 +165,6 @@ #include "scene/resources/texture_rd.h" #include "scene/resources/theme.h" #include "scene/resources/video_stream.h" -#include "scene/resources/visual_shader.h" -#include "scene/resources/visual_shader_nodes.h" -#include "scene/resources/visual_shader_particle_nodes.h" -#include "scene/resources/visual_shader_sdf_nodes.h" #include "scene/theme/theme_db.h" #include "servers/display/display_server.h" #include "servers/rendering/rendering_server.h" @@ -780,123 +776,7 @@ void register_scene_types() { /* REGISTER SHADER */ GDREGISTER_CLASS(Shader); - GDREGISTER_CLASS(VisualShader); GDREGISTER_CLASS(ShaderInclude); - GDREGISTER_ABSTRACT_CLASS(VisualShaderNode); - GDREGISTER_CLASS(VisualShaderNodeCustom); - GDREGISTER_CLASS(VisualShaderNodeInput); - GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeOutput); - GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeResizableBase); - GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeGroupBase); - GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeConstant); - GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeVectorBase); - GDREGISTER_CLASS(VisualShaderNodeFrame); -#ifndef DISABLE_DEPRECATED - GDREGISTER_CLASS(VisualShaderNodeComment); // Deprecated, just for compatibility. -#endif - GDREGISTER_CLASS(VisualShaderNodeFloatConstant); - GDREGISTER_CLASS(VisualShaderNodeIntConstant); - GDREGISTER_CLASS(VisualShaderNodeUIntConstant); - GDREGISTER_CLASS(VisualShaderNodeBooleanConstant); - GDREGISTER_CLASS(VisualShaderNodeColorConstant); - GDREGISTER_CLASS(VisualShaderNodeVec2Constant); - GDREGISTER_CLASS(VisualShaderNodeVec3Constant); - GDREGISTER_CLASS(VisualShaderNodeVec4Constant); - GDREGISTER_CLASS(VisualShaderNodeTransformConstant); - GDREGISTER_CLASS(VisualShaderNodeFloatOp); - GDREGISTER_CLASS(VisualShaderNodeIntOp); - GDREGISTER_CLASS(VisualShaderNodeUIntOp); - GDREGISTER_CLASS(VisualShaderNodeVectorOp); - GDREGISTER_CLASS(VisualShaderNodeColorOp); - GDREGISTER_CLASS(VisualShaderNodeTransformOp); - GDREGISTER_CLASS(VisualShaderNodeTransformVecMult); - GDREGISTER_CLASS(VisualShaderNodeFloatFunc); - GDREGISTER_CLASS(VisualShaderNodeIntFunc); - GDREGISTER_CLASS(VisualShaderNodeUIntFunc); - GDREGISTER_CLASS(VisualShaderNodeVectorFunc); - GDREGISTER_CLASS(VisualShaderNodeColorFunc); - GDREGISTER_CLASS(VisualShaderNodeTransformFunc); - GDREGISTER_CLASS(VisualShaderNodeUVFunc); - GDREGISTER_CLASS(VisualShaderNodeUVPolarCoord); - GDREGISTER_CLASS(VisualShaderNodeDotProduct); - GDREGISTER_CLASS(VisualShaderNodeVectorLen); - GDREGISTER_CLASS(VisualShaderNodeDeterminant); - GDREGISTER_CLASS(VisualShaderNodeDerivativeFunc); - GDREGISTER_CLASS(VisualShaderNodeClamp); - GDREGISTER_CLASS(VisualShaderNodeFaceForward); - GDREGISTER_CLASS(VisualShaderNodeOuterProduct); - GDREGISTER_CLASS(VisualShaderNodeSmoothStep); - GDREGISTER_CLASS(VisualShaderNodeStep); - GDREGISTER_CLASS(VisualShaderNodeVectorDistance); - GDREGISTER_CLASS(VisualShaderNodeVectorRefract); - GDREGISTER_CLASS(VisualShaderNodeMix); - GDREGISTER_CLASS(VisualShaderNodeVectorCompose); - GDREGISTER_CLASS(VisualShaderNodeTransformCompose); - GDREGISTER_CLASS(VisualShaderNodeVectorDecompose); - GDREGISTER_CLASS(VisualShaderNodeTransformDecompose); - GDREGISTER_CLASS(VisualShaderNodeTexture); - GDREGISTER_CLASS(VisualShaderNodeCurveTexture); - GDREGISTER_CLASS(VisualShaderNodeCurveXYZTexture); - GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeSample3D); - GDREGISTER_CLASS(VisualShaderNodeTexture2DArray); - GDREGISTER_CLASS(VisualShaderNodeTexture3D); - GDREGISTER_CLASS(VisualShaderNodeCubemap); - GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeParameter); - GDREGISTER_CLASS(VisualShaderNodeParameterRef); - GDREGISTER_CLASS(VisualShaderNodeFloatParameter); - GDREGISTER_CLASS(VisualShaderNodeIntParameter); - GDREGISTER_CLASS(VisualShaderNodeUIntParameter); - GDREGISTER_CLASS(VisualShaderNodeBooleanParameter); - GDREGISTER_CLASS(VisualShaderNodeColorParameter); - GDREGISTER_CLASS(VisualShaderNodeVec2Parameter); - GDREGISTER_CLASS(VisualShaderNodeVec3Parameter); - GDREGISTER_CLASS(VisualShaderNodeVec4Parameter); - GDREGISTER_CLASS(VisualShaderNodeTransformParameter); - GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeTextureParameter); - GDREGISTER_CLASS(VisualShaderNodeTexture2DParameter); - GDREGISTER_CLASS(VisualShaderNodeTextureParameterTriplanar); - GDREGISTER_CLASS(VisualShaderNodeTexture2DArrayParameter); - GDREGISTER_CLASS(VisualShaderNodeTexture3DParameter); - GDREGISTER_CLASS(VisualShaderNodeCubemapParameter); - GDREGISTER_CLASS(VisualShaderNodeLinearSceneDepth); - GDREGISTER_CLASS(VisualShaderNodeWorldPositionFromDepth); - GDREGISTER_CLASS(VisualShaderNodeScreenNormalWorldSpace); - GDREGISTER_CLASS(VisualShaderNodeIf); - GDREGISTER_CLASS(VisualShaderNodeSwitch); - GDREGISTER_CLASS(VisualShaderNodeFresnel); - GDREGISTER_CLASS(VisualShaderNodeExpression); - GDREGISTER_CLASS(VisualShaderNodeGlobalExpression); - GDREGISTER_CLASS(VisualShaderNodeIs); - GDREGISTER_CLASS(VisualShaderNodeCompare); - GDREGISTER_CLASS(VisualShaderNodeMultiplyAdd); - GDREGISTER_CLASS(VisualShaderNodeBillboard); - GDREGISTER_CLASS(VisualShaderNodeDistanceFade); - GDREGISTER_CLASS(VisualShaderNodeProximityFade); - GDREGISTER_CLASS(VisualShaderNodeRandomRange); - GDREGISTER_CLASS(VisualShaderNodeRemap); - GDREGISTER_CLASS(VisualShaderNodeRotationByAxis); - GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeVarying); - GDREGISTER_CLASS(VisualShaderNodeVaryingSetter); - GDREGISTER_CLASS(VisualShaderNodeVaryingGetter); - GDREGISTER_CLASS(VisualShaderNodeReroute); - - GDREGISTER_CLASS(VisualShaderNodeSDFToScreenUV); - GDREGISTER_CLASS(VisualShaderNodeScreenUVToSDF); - GDREGISTER_CLASS(VisualShaderNodeTextureSDF); - GDREGISTER_CLASS(VisualShaderNodeTextureSDFNormal); - GDREGISTER_CLASS(VisualShaderNodeSDFRaymarch); - - GDREGISTER_CLASS(VisualShaderNodeParticleOutput); - GDREGISTER_ABSTRACT_CLASS(VisualShaderNodeParticleEmitter); - GDREGISTER_CLASS(VisualShaderNodeParticleSphereEmitter); - GDREGISTER_CLASS(VisualShaderNodeParticleBoxEmitter); - GDREGISTER_CLASS(VisualShaderNodeParticleRingEmitter); - GDREGISTER_CLASS(VisualShaderNodeParticleMeshEmitter); - GDREGISTER_CLASS(VisualShaderNodeParticleMultiplyByAxisAngle); - GDREGISTER_CLASS(VisualShaderNodeParticleConeVelocity); - GDREGISTER_CLASS(VisualShaderNodeParticleRandomness); - GDREGISTER_CLASS(VisualShaderNodeParticleAccelerator); - GDREGISTER_CLASS(VisualShaderNodeParticleEmit); GDREGISTER_CLASS(ShaderMaterial); GDREGISTER_CLASS(CanvasTexture);