Commit 17f1ca3

committed

chaning my custom plane class name so it don't conflict with Unity plane class

1 parent 349ae99 commit 17f1ca3Copy full SHA for 17f1ca3

File tree

+17

-12

lines changed

+17

-12

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ public class CreatePlane : MonoBehaviour`
`7`	`7`	`public Transform A;`
`8`	`8`	`public Transform B;`
`9`	`9`	`public Transform C;`
`10`		`- Plane plane;`
	`10`	`+ MPlane plane;`
`11`	`11`
`12`	`12`	`// Start is called before the first frame update`
`13`	`13`	`void Start()`
`14`	`14`	`{`
`15`		`- plane = new Plane(new Coords(A.position),`
	`15`	`+ plane = new MPlane(new Coords(A.position),`
`16`	`16`	`new Coords(B.position),`
`17`	`17`	`new Coords(C.position));`
`18`	`18`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,13 @@ public class CreatePlaneHit : MonoBehaviour`
`10`	`10`	`public Transform D;`
`11`	`11`	`public Transform E;`
`12`	`12`
`13`		`- Plane plane;`
	`13`	`+ MPlane plane;`
`14`	`14`	`Line L1;`
`15`	`15`
`16`	`16`	`// Start is called before the first frame update`
`17`	`17`	`void Start()`
`18`	`18`	`{`
`19`		`- plane = new Plane(new Coords(A.position),`
	`19`	`+ plane = new MPlane(new Coords(A.position),`
`20`	`20`	`new Coords(B.position),`
`21`	`21`	`new Coords(C.position));`
`22`	`22`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public Coords Reflect(Coords normal)`
`38`	`38`	`return r;`
`39`	`39`	`}`
`40`	`40`
`41`		`- public float IntersectsAt(Plane p)`
	`41`	`+ public float IntersectsAt(MPlane p)`
`42`	`42`	`{`
`43`	`43`	`Coords normal = HolisticMath.Cross(p.u, p.v);`
`44`	`44`	`if (HolisticMath.Dot(normal, v) == 0)`

Lines changed: 12 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,14 @@`
`1`		`-using System.Collections;`
`2`		`-using System.Collections.Generic;`
`3`		`-using UnityEngine;`
	`1`	`+using UnityEngine;`
`4`	`2`
`5`		`-public class Plane`
	`3`	`+public class MPlane`
`6`	`4`	`{`
`7`	`5`	`public Coords A;`
`8`	`6`	`Coords B;`
`9`	`7`	`Coords C;`
`10`	`8`	`public Coords v;`
`11`	`9`	`public Coords u;`
`12`	`10`
`13`		`- public Plane(Coords _A, Coords _B, Coords _C)`
	`11`	`+ public MPlane(Coords _A, Coords _B, Coords _C)`
`14`	`12`	`{`
`15`	`13`	`A = _A;`
`16`	`14`	`B = _B;`
`@@ -19,13 +17,20 @@ public Plane(Coords _A, Coords _B, Coords _C)`
`19`	`17`	`u = C - A;`
`20`	`18`	`}`
`21`	`19`
`22`		`- public Plane(Coords _A, Vector3 V, Vector3 U)`
	`20`	`+ public MPlane(Coords _A, Vector3 V, Vector3 U)`
`23`	`21`	`{`
`24`	`22`	`A = _A;`
`25`	`23`	`v = new Coords(V.x, V.y, V.z);`
`26`	`24`	`u = new Coords(U.x, U.y, U.z);`
`27`	`25`	`}`
`28`	`26`
	`27`	`+ public MPlane(Vector3 _A, Vector3 _B, Vector3 _C)`
	`28`	`+ {`
	`29`	`+ A = new Coords(_A.x, _A.y, _A.z);`
	`30`	`+ B = new Coords(_B.x, _B.y, _B.z);`
	`31`	`+ C = new Coords(_C.x, _C.y, _C.z);`
	`32`	`+ }`
	`33`	`+`
`29`	`34`	`public Coords Lerp(float s, float t)`
`30`	`35`	`{`
`31`	`36`	`float xst = A.x + v.x * s + u.x * t;`
`@@ -34,6 +39,6 @@ public Coords Lerp(float s, float t)`
`34`	`39`
`35`	`40`	`return new Coords(xst, yst, zst);`
`36`	`41`	`}`
`37`		`-`
	`42`	`+`
`38`	`43`
`39`	`44`	`}`

Comments

(0)