Browse Source

Merge pull request #20231 from martinRenou/condnode_logical_operators

NodeMaterial: add logical operators to CondNode
Mr.doob 5 years ago
parent
commit
f1270235c9
2 changed files with 4 additions and 0 deletions
  1. 2 0
      examples/jsm/nodes/math/CondNode.d.ts
  2. 2 0
      examples/jsm/nodes/math/CondNode.js

+ 2 - 0
examples/jsm/nodes/math/CondNode.d.ts

@@ -22,5 +22,7 @@ export class CondNode extends TempNode {
 	static GREATER_EQUAL: string;
 	static LESS: string;
 	static LESS_EQUAL: string;
+	static AND: string;
+	static OR: string;
 
 }

+ 2 - 0
examples/jsm/nodes/math/CondNode.js

@@ -20,6 +20,8 @@ CondNode.GREATER = '>';
 CondNode.GREATER_EQUAL = '>=';
 CondNode.LESS = '<';
 CondNode.LESS_EQUAL = '<=';
+CondNode.AND = '&&';
+CondNode.OR = '||';
 
 CondNode.prototype = Object.create( TempNode.prototype );
 CondNode.prototype.constructor = CondNode;