~nbriere/GrafreeD.git - Noware Git Repository

Normand Briere

2019-06-11 5e6a6f3319f0c4c687fe71952ac9ecc17792b83a

Fix normal for mesh

2 files modified

	Vertex.java	2 ●●●●● patch \| view \| raw \| blame \| history
	cSpring.java	2 ●●●●● patch \| view \| raw \| blame \| history

 Vertex.java
.. .. @@ -122,7 +122,7 @@
122 122  
123 123      public boolean equals(Object o)
124 124      {
125 -            assert(norm.normalized());
125 +    // JUNE 2019. norm can be null (e.g. Box)           Grafreed.Assert(norm.normalized());
126 126          //if (true) return false;
127 127  
128 128          Vertex vert = (Vertex) o;
 cSpring.java
.. .. @@ -1724,7 +1724,7 @@
1724 1724              
1725 1725      //        Phys.matrix.Transform(normal);
1726 1726              
1727 -            if (position instanceof Vertex)
1727 +            if (position instanceof Vertex && ((Vertex)position).norm != null)
1728 1728                  ((Vertex)position).norm.set(normal.x,normal.y,normal.z);
1729 1729          }
1730 1730

..	..	@@ -122,7 +122,7 @@
122	122
123	123	public boolean equals(Object o)
124	124	{
125		- assert(norm.normalized());
	125	+ // JUNE 2019. norm can be null (e.g. Box) Grafreed.Assert(norm.normalized());
126	126	//if (true) return false;
127	127
128	128	Vertex vert = (Vertex) o;

..	..	@@ -1724,7 +1724,7 @@
1724	1724
1725	1725	// Phys.matrix.Transform(normal);
1726	1726
1727		- if (position instanceof Vertex)
	1727	+ if (position instanceof Vertex && ((Vertex)position).norm != null)
1728	1728	((Vertex)position).norm.set(normal.x,normal.y,normal.z);
1729	1729	}
1730	1730