Skip to content

Editor: Depth Test is always off in the Material Editor #1027 #1028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 2 commits into from
Jul 13, 2025
Merged

Editor: Depth Test is always off in the Material Editor #1027 #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d2a727
Editor: Depth Test is always off in the Material Editor #1027
eprikazchikov Jul 13, 2025
5da96cb
update
eprikazchikov Jul 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/editor/grapheditor/editor/graph/graphview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ void GraphView::setGraph(AbstractNodeGraph *graph) {

std::list<std::string> nodeList = graph->nodeList();

nodeList.sort();

// Create menu
for(auto &it : nodeList) {
QMenu *menu = m_createMenu;
Expand Down
1 change: 1 addition & 0 deletions modules/editor/grapheditor/editor/graph/graphwidgets/linksrender.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ void LinksRender::draw(CommandBuffer &buffer) {
if(!vertices.empty()) {
m_creationMesh->setVertices(vertices);
m_creationMesh->setUv0(uvs);
m_creationMesh->setColors(colors);
m_creationMesh->setIndices(indices);
m_creationMesh->recalcBounds();
}
Expand Down
22 changes: 11 additions & 11 deletions modules/editor/shadertools/converter/functions/vectoroperator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class VectorOperator : public ShaderNode {
};

class CrossProduct : public ShaderNode {
A_OBJECT(CrossProduct, ShaderNode, Shader/Vector_Operators)
A_OBJECT(CrossProduct, ShaderNode, Shader/Vector Operators)

public:
CrossProduct() {
Expand All @@ -30,7 +30,7 @@ class CrossProduct : public ShaderNode {
};

class Distance : public ShaderNode {
A_OBJECT(Distance, ShaderNode, Shader/Vector_Operators)
A_OBJECT(Distance, ShaderNode, Shader/Vector Operators)

public:
Distance() {
Expand All @@ -49,7 +49,7 @@ class Distance : public ShaderNode {
};

class DotProduct : public ShaderNode {
A_OBJECT(DotProduct, ShaderNode, Shader/Vector_Operators)
A_OBJECT(DotProduct, ShaderNode, Shader/Vector Operators)

public:
DotProduct() {
Expand All @@ -68,7 +68,7 @@ class DotProduct : public ShaderNode {
};

class Length : public ShaderNode {
A_OBJECT(Length, ShaderNode, Shader/Vector_Operators)
A_OBJECT(Length, ShaderNode, Shader/Vector Operators)

public:
Length() {
Expand All @@ -86,7 +86,7 @@ class Length : public ShaderNode {
};

class Normalize : public ShaderNode {
A_OBJECT(Normalize, ShaderNode, Shader/Vector_Operators)
A_OBJECT(Normalize, ShaderNode, Shader/Vector Operators)

public:
Normalize() {
Expand All @@ -104,7 +104,7 @@ class Normalize : public ShaderNode {
};

class Reflect : public ShaderNode {
A_OBJECT(Reflect, ShaderNode, Shader/Vector_Operators)
A_OBJECT(Reflect, ShaderNode, Shader/Vector Operators)

public:
Reflect() {
Expand All @@ -123,7 +123,7 @@ class Reflect : public ShaderNode {
};

class Refract : public ShaderNode {
A_OBJECT(Refract, ShaderNode, Shader/Vector_Operators)
A_OBJECT(Refract, ShaderNode, Shader/Vector Operators)

public:
Refract() {
Expand All @@ -143,7 +143,7 @@ class Refract : public ShaderNode {
};

class Append : public VectorOperator {
A_OBJECT(Append, ShaderNode, Shader/Vector_Operators)
A_OBJECT(Append, ShaderNode, Shader/Vector Operators)

public:
Append() {
Expand Down Expand Up @@ -204,7 +204,7 @@ class Append : public VectorOperator {
};

class Split : public VectorOperator {
A_OBJECT(Split, ShaderNode, Shader/Vector_Operators)
A_OBJECT(Split, ShaderNode, Shader/Vector Operators)

A_PROPERTIES(
A_PROPERTY(float, default_X, Split::valueX, Split::setValueX),
Expand Down Expand Up @@ -276,7 +276,7 @@ class Split : public VectorOperator {
};

class Swizzle : public VectorOperator {
A_OBJECT(Swizzle, ShaderNode, Shader/Vector_Operators)
A_OBJECT(Swizzle, ShaderNode, Shader/Vector Operators)

A_PROPERTIES(
A_PROPERTYEX(Components, channel_0, Swizzle::channel0, Swizzle::setChannel0, "enum=Components"),
Expand Down Expand Up @@ -380,7 +380,7 @@ class Swizzle : public VectorOperator {
};

class Mask : public VectorOperator {
A_OBJECT(Mask, ShaderNode, Shader/Vector_Operators)
A_OBJECT(Mask, ShaderNode, Shader/Vector Operators)

A_PROPERTIES(
A_PROPERTY(bool, R, Mask::r, Mask::setR),
Expand Down
2 changes: 1 addition & 1 deletion modules/editor/shadertools/converter/rootnode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ShaderRootNode : public GraphNode {
A_PROPERTY(bool, depthWrite, ShaderRootNode::depthWrite, ShaderRootNode::setDepthWrite),
A_PROPERTYEX(TestFunction, depthCompare, ShaderRootNode::depthCompare, ShaderRootNode::setDepthCompare, "enum=TestFunction"),

A_PROPERTY(bool, stencilTest, ShaderRootNode::stencilTest, ShaderRootNode::setDepthTest),
A_PROPERTY(bool, stencilTest, ShaderRootNode::stencilTest, ShaderRootNode::setStencilTest),
A_PROPERTY(int, stencilReadMask, ShaderRootNode::stencilReadMask, ShaderRootNode::setStencilReadMask),
A_PROPERTY(int, stencilWriteMask, ShaderRootNode::stencilWriteMask, ShaderRootNode::setStencilWriteMask),
A_PROPERTY(int, stencilReference, ShaderRootNode::stencilReference, ShaderRootNode::setStencilReference),
Expand Down
6 changes: 5 additions & 1 deletion modules/editor/shadertools/converter/shadergraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,11 @@ ShaderGraph::ShaderGraph() :
Url url(it.second);

if(url.host() == "Shader") {
m_nodeTypes.push_back(url.path());
std::string path = url.path();
if(path.front() == '/') {
path.erase(0, 1);
}
m_nodeTypes.push_back(path);
}
}

Expand Down
67 changes: 36 additions & 31 deletions modules/editor/shadertools/templates/Material.mtl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,36 @@
{
"Blend": 0,
"Depth": true,
"Links": [
{
"IPort": 0,
"OPort": 0,
"Receiver": 0,
"Sender": 1
}
],
"Model": 1,
"Nodes": [
{
"Type": "ConstVector3",
"Values": {
"Value": [
67,
255,
255,
255,
255
]
},
"X": -200,
"Y": 0
}
],
"Side": false,
"Type": 0
}
<document version="14">
<graph>
<nodes>
<node y="0" x="0" type="ShaderRootNode" index="0">
<value name="materialType" type="int">0</value>
<value name="lightingModel" type="int">1</value>
<value name="wireFrame" type="bool">false</value>
<value name="twoSided" type="bool">false</value>
<value name="useWithSkinned" type="bool">true</value>
<value name="useWithParticles" type="bool">true</value>
<value name="blendColorOperation" type="int">0</value>
<value name="blendAlphaOperation" type="int">0</value>
<value name="blendSourceColor" type="int">0</value>
<value name="blendSourceAlpha" type="int">0</value>
<value name="blendDestinationColor" type="int">1</value>
<value name="blendDestinationAlpha" type="int">1</value>
<value name="depthTest" type="bool">true</value>
<value name="depthWrite" type="bool">true</value>
<value name="depthCompare" type="int">1</value>
<value name="stencilTest" type="bool">false</value>
<value name="stencilReadMask" type="int">1</value>
<value name="stencilWriteMask" type="int">1</value>
<value name="stencilReference" type="int">0</value>
<value name="stencilCompareBack" type="int">7</value>
<value name="stencilCompareFront" type="int">7</value>
<value name="stencilFailBack" type="int">0</value>
<value name="stencilFailFront" type="int">0</value>
<value name="stencilPassBack" type="int">0</value>
<value name="stencilPassFront" type="int">0</value>
<value name="stencilZFailBack" type="int">0</value>
<value name="stencilZFailFront" type="int">0</value>
</node>
</nodes>
<links/>
</graph>
</document>
Loading