From cb37a129d1adb403019c96e798e86e2da9667f15 Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Sun, 17 Nov 2019 17:56:04 -0500 Subject: [PATCH] Maze --- Object3D.java | 634 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 527 insertions(+), 107 deletions(-) diff --git a/Object3D.java b/Object3D.java index ff18bbd..bcefc4f 100644 --- a/Object3D.java +++ b/Object3D.java @@ -41,8 +41,24 @@ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>(); + transient int tabIndex; // Tabs can change between sessions. + ScriptNode scriptnode; + void GetOrigin(cVector o) + { + o.x = this.toParent[3][0]; + o.y = this.toParent[3][1]; + o.z = this.toParent[3][2]; + } + + void SetOrigin(cVector o) + { + this.toParent[3][0] = o.x; + this.toParent[3][1] = o.y; + this.toParent[3][2] = o.z; + } + void deepCopyNode(Object3D other) { other.skyboxname = skyboxname; @@ -100,7 +116,7 @@ other.softtouched = softtouched; other.random = random; - other.link2master = link2master; + other.link2master = Link2Support(); other.transformcount = transformcount; other.marked = marked; other.skip = skip; @@ -140,6 +156,7 @@ projectedVertices[i] = new cVector2(); // Others } projectedVertices[0].x = 100; // bump + projectedVertices[1].y = 1000; // punchthrough. only for png } void MinMax(cVector minima, cVector maxima) @@ -219,7 +236,7 @@ return; transientsupport = support; - transientlink2master = link2master; + transientlink2master = Link2Support(); support = null; link2master = false; @@ -632,7 +649,10 @@ transient boolean keepdontselect; boolean dontselect = false; boolean hide = false; - boolean link2master = false; // performs reset support/master at each frame + + boolean link2master = false; // performs reset support/master at each frame (cannot rename due to serialization) + boolean link2support = false; // (cannot rename due to serialization) + boolean marked = false; // animation node boolean skip = false; // centroid issue boolean skipmocap = false; // mocap data @@ -640,6 +660,9 @@ boolean random = false; boolean speedup = false; boolean rewind = false; + + // Option to sort triangles, e.g. for transparency. + boolean sort = false; float NORMALPUSH = 0; @@ -650,27 +673,74 @@ return this; } + class SizeCompare implements Comparable + { + int size; + Object3D child; + + SizeCompare(Object3D c) + { + child = c; + size = c.MemorySize(); + } + + public int compareTo(Object o) + { + SizeCompare comp = (SizeCompare) o; + + return comp.size < size ? 1 : -1; + } + } + + transient SizeCompare[] sizecompare = null; + void SortBySize() { - boolean sorted = false; +// boolean sorted = false; +// +// while (!sorted) +// { +// sorted = true; +// +// for (int i=0; i<Size()-1; i++) +// { +// Object3D obji = get(i); +// Object3D objj = get(i+1); +// +// if (obji.MemorySize() < objj.MemorySize()) +// { +// set(i, objj); +// set(i+1, obji); +// +// sorted = false; +// } +// } +// } + + int count = Size(); - while (!sorted) + if (sizecompare == null || sizecompare.length != count) { - sorted = true; - - for (int i=0; i<size()-1; i++) + sizecompare = new SizeCompare[count]; + + for (int k=0; k<count; k++) { - Object3D obji = get(i); - Object3D objj = get(i+1); - - if (obji.MemorySize() < objj.MemorySize()) - { - set(i, objj); - set(i+1, obji); - - sorted = false; - } + sizecompare[k] = new SizeCompare(get(k)); } + } + else + { + for (int k=0; k<count; k++) + { + sizecompare[k].size = get(k).MemorySize(); + } + } + + java.util.Arrays.sort(sizecompare); + + for (int i=0; i<count; i++) + { + set(i, sizecompare[i].child); } } @@ -682,7 +752,7 @@ { sorted = true; - for (int i=0; i<size()-1; i++) + for (int i=0; i<Size()-1; i++) { Object3D obji = get(i); Object3D objj = get(i+1); @@ -702,34 +772,59 @@ int MemorySize() { - if (memorysize == 0) +// if (memorysize == 0) +// { +// try +// { +// Object3D obj = this; +// +// Object3D parent = obj.parent; +// obj.parent = null; +// Object3D support = obj.support; +// obj.support = null; +// +// java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream(); +// java.io.ObjectOutputStream out = new java.io.ObjectOutputStream(baos); +// +// out.writeObject(obj); +// +// obj.parent = parent; +// obj.support = support; +// +// memorysize = baos.toByteArray().length; +// } +// catch (Exception e) +// { +// e.printStackTrace(); +// } +// } +// +// return memorysize; + + if (blockloop) { - try - { - Object3D obj = this; + return 0; + } - Object3D parent = obj.parent; - obj.parent = null; - Object3D support = obj.support; - obj.support = null; - - java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream(); - java.io.ObjectOutputStream out = new java.io.ObjectOutputStream(baos); - - out.writeObject(obj); - - obj.parent = parent; - obj.support = support; - - memorysize = baos.toByteArray().length; - } - catch (Exception e) - { - e.printStackTrace(); - } + int memory = 0; + + if (bRep != null) + { + memory = bRep.VertexCount(); } - return memorysize; + blockloop = true; + + for (int i = 0; i < Size(); i++) + { + Object3D obj = (Object3D) Children().get(i); + + memory += obj.MemorySize(); + } + + blockloop = false; + + return memory; } void Slower() @@ -1019,7 +1114,7 @@ void Step() { - // marde pour serialization de Texture + // patch pour serialization de Texture resetmaxcount(); resettransformcount(); resetstep(); @@ -1054,7 +1149,7 @@ transformcount++; } - int maxcount; + int maxcount = 128; int transformcount; int step; @@ -1107,7 +1202,10 @@ if (step == 0) step = 1; if (maxcount == 0) - maxcount = 128; // 2048; // 4; + { + System.out.println("maxcount == 0"); + System.exit(0); // maxcount = 128; // 2048; // 4; + } // if (acceleration == 0) // acceleration = 10; if (delay == 0) // serial @@ -1133,6 +1231,8 @@ (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) && currentframe != Globals.framecount) { + Globals.lighttouched = true; + currentframe = Globals.framecount; // System.err.println("transformcount = " + transformcount); @@ -1212,24 +1312,28 @@ { // return true; - if (material == null || material.multiply) - return true; +// if (material == null || material.multiply) +// return true; +// +// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000) +// return false; +// +// // Transparent objects are dynamic because we have to sort the triangles. +// return material.opacity > 0.99; - if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000) - return false; - - // Transparent objects are dynamic because we have to sort the triangles. - return material.opacity > 0.99; + return !sort; } boolean IsOpaque() { // return true; - if (material == null || material.multiply) - return true; +// if (material == null || material.multiply) +// return true; +// +// return material.opacity > 0.99; - return material.opacity > 0.99; + return !sort; } Object3D() @@ -1413,7 +1517,7 @@ blockloop = true; - other.parent = parent; + // other.parent = parent; //System.out.println("COPY " + this + " to " + other); //new Exception().printStackTrace(); @@ -1449,7 +1553,7 @@ Object3D obj = (Object3D)Children().get(i); if (IsContainedIn(obj)) { -// assert(false); // ?!?!?!?!?! + assert(false); // ?!?!?!?!?! c.Children().setElementAt(c, i); } else @@ -2547,7 +2651,7 @@ return b; } - void UpdateMaterial(cMaterial anchor, cMaterial current, boolean propagate) + void UpdateMaterial(cMaterial anchor, cMaterial current, boolean propagate, boolean colorparallax) { if (blockloop) { @@ -2557,7 +2661,7 @@ // super.UpdateMaterial(anchor, current, false); if (material != null) { - material.UpdateMaterial(anchor, current); + material.UpdateMaterial(anchor, current, colorparallax); } if (!propagate) @@ -2571,7 +2675,7 @@ if (child == null) continue; blockloop = true; - child.UpdateMaterial(anchor, current, propagate); + child.UpdateMaterial(anchor, current, propagate, false); blockloop = false; Children().release(i); } @@ -2585,7 +2689,7 @@ if (child == null) continue; blockloop = true; - child.UpdateMaterial(anchor, current, propagate); + child.UpdateMaterial(anchor, current, propagate, false); blockloop = false; Children().release(i); } @@ -3406,7 +3510,7 @@ } } - public void Scale(int scale) + public void Scale(float scale) { Object3D obj = this; @@ -4040,6 +4144,7 @@ void RevertMeshes() { + // BLOCKLOOP if (this instanceof cMesh) { ((cMesh)this).Revert(); @@ -4070,11 +4175,6 @@ Touch(); } - ResetRecur(); - } - - void ResetRecur() - { for (int i = 0; i < size(); i++) { Object3D child = (Object3D) get(i); // reserve(i); @@ -4097,11 +4197,6 @@ Step(); Touch(); - StepRecur(); - } - - void StepRecur() - { for (int i = 0; i < size(); i++) { Object3D child = (Object3D) get(i); // reserve(i); @@ -4288,8 +4383,8 @@ Touch(); } - transient cVector min = new cVector(); - transient cVector max = new cVector(); + transient cVector min; + transient cVector max; void getBounds(cVector minima, cVector maxima, boolean xform) { @@ -4305,7 +4400,7 @@ if (blockloop) return; - if (min == null) // ??? + if (min == null) { min = new cVector(); max = new cVector(); @@ -4346,7 +4441,7 @@ if (bRep != null) { - bRep.getBounds(minima,maxima,this); + bRep.getBounds(minima, maxima, xform?this:null); } if (false) // xform) @@ -5619,8 +5714,9 @@ { } // transient int displaylist = 0; // -1; - transient boolean touched = true; - transient boolean softtouched = true; + transient boolean reset = false; // Recalculate + transient boolean touched = true; // call list only + transient boolean softtouched = true; // aucune idee void Touch() { @@ -5673,6 +5769,7 @@ { //System.out.println("HardTouch " + this); // new Exception().printStackTrace(); //new Exception().printStackTrace(); + reset = true; touched = true; CameraPane.touched = true; //if (parent != null) @@ -6155,7 +6252,7 @@ boolean NeedSupport() { return - CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null + CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /*live &&*/ support != null // PROBLEM with CROWD!! && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD); } @@ -6178,6 +6275,17 @@ return live && bRep != null; } + boolean Link2Support() + { + return link2master || link2support; + } + + static cVector minima = new cVector(); + static cVector maxima = new cVector(); + static javax.vecmath.Point3d center = new javax.vecmath.Point3d(); + + boolean compiling; + void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked) { Invariants(); // june 2013 @@ -6185,6 +6293,29 @@ if (support != null) { // System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame); + } + + if (false) // live && Link2Support() && support == null && !this.marked) // project on ground + { + getBounds(minima, maxima, true); + center.x = (minima.x + maxima.x) / 2; + center.y = 10000; // (minima.y + maxima.y) / 2; + center.z = (minima.z + maxima.z) / 2; + + Ray ray = new Ray(center, new Vector3d(0,-1,0)); + + IntersectResult res = new IntersectResult(); + res.t = Double.POSITIVE_INFINITY; + + if (Grafreed.grafreed.universe.intersect(ray, res)) + { + double resx = ray.eyePoint.x + ray.viewDirection.x * res.t; + double resy = ray.eyePoint.y + ray.viewDirection.y * res.t; + double resz = ray.eyePoint.z + ray.viewDirection.z * res.t; + + LA.matTranslate(toParent, 0, resy - minima.y, 0); + LA.matInvert(toParent, fromParent); + } } if (display.DrawMode() == iCameraPane.SELECTION && @@ -6239,8 +6370,9 @@ support = support; boolean usecalllists = !IsDynamic() && - IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch); - //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch); + IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch); + + //usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch); //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass. @@ -6250,7 +6382,8 @@ bRep.displaylist = 0; } // usecalllists &= !(parent instanceof RandomNode); - // usecalllists = false; + if (CameraPane.BOXMODE) // Too dynamic + usecalllists = false; if (display.DrawMode() == display.SHADOW) //GetBRep() != null) @@ -6264,7 +6397,7 @@ if (!selectmode && //display.DrawMode() != display.SELECTION && //(touched || (bRep != null && bRep.displaylist <= 0))) - (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0))) + ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) || touched)) // || (bRep != null && bRep.displaylist <= 0))) { Globals.lighttouched = true; } // all panes... @@ -6293,7 +6426,9 @@ display.NewList(bRep.displaylist); } + compiling = true; CallList(display, root, selected, blocked); + compiling = false; // compiled = true; if (usecalllists && bRep.displaylist > 0) @@ -6306,8 +6441,8 @@ Globals.lighttouched = true; // all panes... } - touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false; - //touched = false; + //touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false; + touched = false; if (this instanceof Texture || this instanceof TextureNode) { @@ -6346,7 +6481,7 @@ { if (display.DrawMode() == iCameraPane.SHADOW) { - if (!link2master // tricky to cull in shadow mode. + if (!Link2Support() // tricky to cull in shadow mode. && GetBRep().FrustumCull(this, null, display.LightCamera(), true)) { //System.out.print("CULLED"); @@ -6454,6 +6589,7 @@ boolean failedPigment = false; boolean failedBump = false; + CameraPane.lastObject = this; try { display.BindPigmentTexture(tex, texres); @@ -6493,7 +6629,7 @@ } } - assert (!(this instanceof Composite)); + // Bezier surface: assert (!(this instanceof Composite)); { // CRASH MOCAP!! for (int i = 0; i < size(); i++) // { @@ -6767,15 +6903,18 @@ void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected) { - if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000) - return; // no shadow for transparent objects - - if (display.DrawMode() == iCameraPane.SELECTION && dontselect) - return; + if (!compiling) + { + if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000) + return; // no shadow for transparent objects + + if (display.DrawMode() == iCameraPane.SELECTION && dontselect) + return; + } if (hide) return; - + if (scriptnode != null) { scriptnode.DrawNode(display, root, selected); @@ -6818,7 +6957,8 @@ //javax.media.opengl.GL gl = display.GetGL(); - if (CameraPane.BOXMODE && !selected) // || CameraPane.movingcamera) + if (CameraPane.BOXMODE && !Link2Support()) // + //!selected) // || CameraPane.movingcamera) { int fc = bRep.FaceCount(); int vc = bRep.VertexCount(); @@ -6980,7 +7120,7 @@ facescompare[k] = new FaceCompare(k); } - center = new cVector(); + centertriangle = new cVector(); } else { @@ -7103,7 +7243,7 @@ */ } - transient cVector center; + transient cVector centertriangle; class FaceCompare implements Comparable { @@ -7132,14 +7272,14 @@ Vertex q = bRep.GetVertex(face.q); Vertex r = bRep.GetVertex(face.r); - center.set(p); - center.add(q); - center.add(r); - center.mul(1.0/3); + centertriangle.set(p); + centertriangle.add(q); + centertriangle.add(r); + centertriangle.mul(1.0/3); - center.sub(Globals.theRenderer.EyeCamera().location); + centertriangle.sub(Globals.theRenderer.EyeCamera().location); - distance = center.dot(center); + distance = centertriangle.dot(centertriangle); } return distance; @@ -8310,7 +8450,7 @@ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")"; } else { - objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ ""; + objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + ((bRep==null)?(count - 1):bRep.VertexCount()) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ ""; } // + super.toString(); //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName(); @@ -8322,7 +8462,7 @@ public int hashCode() { - // Fuck Vector... + // Do not use Vector... return System.identityHashCode(this); } @@ -8562,8 +8702,8 @@ private static cVector2 qq2 = new cVector2(); private static cVector2 rr2 = new cVector2(); private static cVector2 ss2 = new cVector2(); - private static cVector edge1 = new cVector(); - private static cVector edge2 = new cVector(); +// private static cVector edge1 = new cVector(); +// private static cVector edge2 = new cVector(); //private static cVector norm = new cVector(); /*transient private*/ int hitSomething; static final int hitCenter = 1; @@ -8761,7 +8901,275 @@ Touch(); } + + static Vertex s1 = new Vertex(); + static Vertex s2 = new Vertex(); + static Vertex s3 = new Vertex(); + boolean intersectMesh(Ray ray, IntersectResult result) + { + boolean success = false; + + if (bRep.stripified) + { + int[] strips = bRep.getRawIndices(); + + // TRIANGLE STRIP ARRAY + if (bRep.trimmed) + { + float[] v = bRep.getRawVertices(); + + int count3 = 0; + + if (v.length > 0) + { + for (int i = 0; i < strips.length; i++) + { + s1.set(v[count3], v[count3 + 1], v[count3 + 2]); + count3 += 3; + + s2.set(v[count3], v[count3 + 1], v[count3 + 2]); + count3 += 3; + + for (int j = 0; j < strips[i] - 2; j++) + { + s3.set(v[count3], v[count3 + 1], v[count3 + 2]); + count3 += 3; + + if (j%2 == 0) + success |= intersectTriangle(ray, result, s1, s2, s3); + else + success |= intersectTriangle(ray, result, s1, s3, s2); + + s1.set(s2); + s2.set(s3); + } + } + } + + assert count3 == v.length; + } + else // !trimmed + { + int count = 0; + for (int i = 0; i < strips.length; i++) + { + Vertex p = bRep.GetVertex(bRep.indices[count++]); + Vertex q = bRep.GetVertex(bRep.indices[count++]); + + for (int j = 0; j < strips[i] - 2; j++) + { + Vertex r = bRep.GetVertex(bRep.indices[count++]); + + if (j%2 == 0) + success |= intersectTriangle(ray, result, p, q, r); + else + success |= intersectTriangle(ray, result, p, r, q); + + p = q; + q = r; + } + } + } + } else // catch (Error e) + { + int facecount = bRep.FaceCount(); + for (int i = 0; i < facecount; i++) + { + Face face = bRep.GetFace(i); + + Vertex p = bRep.GetVertex(face.p); + Vertex q = bRep.GetVertex(face.q); + Vertex r = bRep.GetVertex(face.r); + + success |= intersectTriangle(ray, result, p, q, r); + } + } + + return success; + } + + static cVector eye = new cVector(); + static cVector dir = new cVector(); + + transient BBox bbox = null; + + boolean intersect(Ray ray, IntersectResult result) + { + double eyex = ray.eyePoint.x; + double eyey = ray.eyePoint.y; + double eyez = ray.eyePoint.z; + + double dirx = ray.viewDirection.x; + double diry = ray.viewDirection.y; + double dirz = ray.viewDirection.z; + + if (this.fromParent != null && !(this instanceof TextureNode)) + { + eye.x = eyex; + eye.y = eyey; + eye.z = eyez; + dir.x = dirx; + dir.y = diry; + dir.z = dirz; + + LA.xformPos(eye, this.fromParent, eye); + LA.xformDir(dir, this.fromParent, dir); + + ray.eyePoint.x = eye.x; + ray.eyePoint.y = eye.y; + ray.eyePoint.z = eye.z; + + ray.viewDirection.x = dir.x; + ray.viewDirection.y = dir.y; + ray.viewDirection.z = dir.z; + } + + boolean success = false; + + boolean touch = false; + + if (bRep != null && Link2Support()) + { + if (bbox == null) + { + bbox = new BBox(); + + cVector min = new cVector(); + cVector max = new cVector(); + + this.getBounds(min, max, true); + + bbox.min.x = min.x; + bbox.min.y = min.y; + bbox.min.z = min.z; + + bbox.max.x = max.x; + bbox.max.y = max.y; + bbox.max.z = max.z; + } + + if (true) // NOT WORKING bbox.intersect(ray, result)) + { + success |= intersectMesh(ray, result); + } + else + { + //this.hide = true; + touch = true; + } + } + + for (int i=0; i<size(); i++) + { + Object3D child = (Object3D) reserve(i); + + if (child == null) + continue; + + success |= child.intersect(ray, result); + release(i); + } + + ray.eyePoint.x = eyex; + ray.eyePoint.y = eyey; + ray.eyePoint.z = eyez; + + ray.viewDirection.x = dirx; + ray.viewDirection.y = diry; + ray.viewDirection.z = dirz; + +// if (touch) +// this.Touch(); // refresh display list + + return success; + } + + static Vector3d edge1 = new Vector3d(); + static Vector3d edge2 = new Vector3d(); + static Vector3d P = new Vector3d(); + static Vector3d T = new Vector3d(); + static Vector3d Q = new Vector3d(); + + private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3) + { + if (false) + { + result.t = 0; + return true; + } + + /* + Fast, Minimum Storage Ray/Triangle Intersection, Moller et al. + + Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf + */ + + // Calculate edges of the triangle + edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z); + edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z); + + // Calculate the determinant (U parameter) + P.cross(ray.viewDirection, edge2); + double det = edge1.dot(P); + + if (det > -1e-9 && det < 1e-9) + { + return false; + } // Ray lies in plane of triangle + + double invDet = 1 / det; + + // Calculate distance from vertex1 to ray origin + T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z); + + double U = (T.dot(P)) * invDet; // Calculate U parameter + + if (U < 0.f || U > 1.f) + { + return false; + } // Intersection lies outside of the triangle + + // Calculate V parameter + Q.cross(T, edge1); + + double V = ray.viewDirection.dot(Q) * invDet; + + if (V < 0.f || (U + V) > 1.f) + { + return false; + } // Intersection lies outside of the triangle + + double t = edge2.dot(Q) * invDet; + + if (t > 1e-9) // Triangle and ray intersects + { + //result.isIntersected = true; + //result.id = id; + + if (false) // isShadow) + { + result.t = t; + return true; + } else if (t < result.t) + { + result.object = this; + + result.t = t; + + //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t; + //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t; + //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t; + + result.n.cross(edge1, edge2); + result.n.normalize(); + } + + return true; + } + + return false; + } public int Size() { @@ -8858,5 +9266,17 @@ return -1; } */ + + void Translate(double x, double y, double z) + { + if (toParent == null) + { + toParent = LA.newMatrix(); + fromParent = LA.newMatrix(); + } + + LA.matTranslate(toParent, x, y, z); + LA.matTranslateInv(fromParent, -x, -y, -z); + } } -- Gitblit v1.6.2