sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

proper equal and hashcode for ShaderNodesVariables.

Browse Source
This commit is contained in:
Rémy Bouquet 2016-05-14 23:46:21 +02:00
parent 4faf6cf36c
commit 29dfff223c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jme3-core/src/main/java/com/jme3/shader/ShaderNodeVariable.java
View File

@ -150,7 +150,12 @@ public class ShaderNodeVariable implements Savable, Cloneable {
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 5; int hash = 7;
hash = 29 * hash + (name != null?name.hashCode():0);
hash = 29 * hash + (type != null?type.hashCode():0);
hash = 29 * hash + (nameSpace != null?nameSpace.hashCode():0);
hash = 29 * hash + (condition != null?condition.hashCode():0);
hash = 29 * hash + (multiplicity != null?multiplicity.hashCode():0);
return hash; return hash;
} }
@ -172,6 +177,12 @@ public class ShaderNodeVariable implements Savable, Cloneable {
if ((this.nameSpace == null) ? (other.nameSpace != null) : !this.nameSpace.equals(other.nameSpace)) { if ((this.nameSpace == null) ? (other.nameSpace != null) : !this.nameSpace.equals(other.nameSpace)) {
return false; return false;
} }
if ((this.condition == null) ? (other.condition != null) : !this.condition.equals(other.condition)) {
return false;
}
if ((this.multiplicity == null) ? (other.multiplicity != null) : !this.multiplicity.equals(other.multiplicity)) {
return false;
}
return true; return true;
} }