.. | .. |
---|
172 | 172 | bufV = other.bufV; |
---|
173 | 173 | bufF = other.bufF; |
---|
174 | 174 | |
---|
175 | | - positions = (float[]) GraphreeD.clone(other.positions); |
---|
176 | | - normals = (float[]) GraphreeD.clone(other.normals); |
---|
177 | | - colors = (float[]) GraphreeD.clone(other.colors); |
---|
178 | | - uvmap = (float[]) GraphreeD.clone(other.uvmap); |
---|
179 | | - triangles = (int[]) GraphreeD.clone(other.triangles); |
---|
| 175 | + positions = (float[]) GrafreeD.clone(other.positions); |
---|
| 176 | + normals = (float[]) GrafreeD.clone(other.normals); |
---|
| 177 | + colors = (float[]) GrafreeD.clone(other.colors); |
---|
| 178 | + uvmap = (float[]) GrafreeD.clone(other.uvmap); |
---|
| 179 | + triangles = (int[]) GrafreeD.clone(other.triangles); |
---|
180 | 180 | |
---|
181 | | - indices = (int[]) GraphreeD.clone(other.indices); |
---|
| 181 | + indices = (int[]) GrafreeD.clone(other.indices); |
---|
182 | 182 | |
---|
183 | | - vertices = (Vector<Vertex>) GraphreeD.clone(other.vertices); |
---|
184 | | - faces = (Vector<Face>) GraphreeD.clone(other.faces); |
---|
| 183 | + vertices = (Vector<Vertex>) GrafreeD.clone(other.vertices); |
---|
| 184 | + faces = (Vector<Face>) GrafreeD.clone(other.faces); |
---|
185 | 185 | } |
---|
186 | 186 | else |
---|
187 | 187 | { |
---|
.. | .. |
---|
1492 | 1492 | InitFaceIndices(); |
---|
1493 | 1493 | } |
---|
1494 | 1494 | |
---|
1495 | | - BoundaryRep rep = (BoundaryRep) GraphreeD.clone(this); |
---|
| 1495 | + BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this); |
---|
1496 | 1496 | //float[] v = new float[100]; |
---|
1497 | 1497 | |
---|
1498 | 1498 | for (int loops=1; --loops>=0;) |
---|
.. | .. |
---|
1522 | 1522 | InitFaceIndices(); |
---|
1523 | 1523 | } |
---|
1524 | 1524 | |
---|
1525 | | - BoundaryRep rep = (BoundaryRep) GraphreeD.clone(this); |
---|
| 1525 | + BoundaryRep rep = (BoundaryRep) GrafreeD.clone(this); |
---|
1526 | 1526 | //float[] v = new float[100]; |
---|
1527 | 1527 | |
---|
1528 | 1528 | for (int loops=10; --loops>=0;) |
---|
.. | .. |
---|
2163 | 2163 | // if (slow) |
---|
2164 | 2164 | // aout 2013 |
---|
2165 | 2165 | // sept 2013 merde... |
---|
2166 | | - W = 13; |
---|
| 2166 | + W = 3; // 13; |
---|
2167 | 2167 | |
---|
2168 | 2168 | // POSERATE |
---|
2169 | 2169 | if (CameraPane.tickcount > 0 || CameraPane.SLOWPOSE) |
---|
.. | .. |
---|
2600 | 2600 | // if (stepout && !playedonce) |
---|
2601 | 2601 | // { |
---|
2602 | 2602 | // // sound |
---|
2603 | | -// GraphreeD.wav.play(); |
---|
| 2603 | +// GrafreeD.wav.play(); |
---|
2604 | 2604 | // playedonce = true; |
---|
2605 | 2605 | // } |
---|
2606 | 2606 | // |
---|
.. | .. |
---|
2644 | 2644 | |
---|
2645 | 2645 | if (CameraPane.framecount - lastsoundtime > 30) // 0.25 secs |
---|
2646 | 2646 | { |
---|
2647 | | - GraphreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1); |
---|
| 2647 | + GrafreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1); |
---|
2648 | 2648 | |
---|
2649 | 2649 | lastsoundtime = CameraPane.framecount; |
---|
2650 | 2650 | } |
---|
.. | .. |
---|
3229 | 3229 | k /= x*x + y*y; |
---|
3230 | 3230 | } |
---|
3231 | 3231 | else |
---|
3232 | | - GraphreeD.Assert(z == 1); |
---|
| 3232 | + GrafreeD.Assert(z == 1); |
---|
3233 | 3233 | |
---|
3234 | 3234 | if (k < 0) |
---|
3235 | 3235 | k = 0; |
---|
.. | .. |
---|
4233 | 4233 | int count = VertexCount(); |
---|
4234 | 4234 | |
---|
4235 | 4235 | // mars 2014 |
---|
4236 | | - while (step >= count) |
---|
| 4236 | + while (step > count) |
---|
4237 | 4237 | step /= 10; |
---|
4238 | 4238 | |
---|
4239 | 4239 | for (int i = 0; i < count; i+=step) |
---|
.. | .. |
---|
7391 | 7391 | Trim(); |
---|
7392 | 7392 | Untrim(); |
---|
7393 | 7393 | |
---|
7394 | | - BoundaryRep tmp = new BoundaryRep(); // (BoundaryRep) GraphreeD.clone(this); |
---|
| 7394 | + BoundaryRep tmp = new BoundaryRep(); // (BoundaryRep) GrafreeD.clone(this); |
---|
7395 | 7395 | |
---|
7396 | 7396 | double minx = Float.POSITIVE_INFINITY; |
---|
7397 | 7397 | double maxx = Float.NEGATIVE_INFINITY; |
---|
.. | .. |
---|
8067 | 8067 | if (!trimmed) |
---|
8068 | 8068 | return; |
---|
8069 | 8069 | |
---|
8070 | | - GraphreeD.linkUV = false; |
---|
| 8070 | + GrafreeD.linkUV = false; |
---|
8071 | 8071 | |
---|
8072 | 8072 | try |
---|
8073 | 8073 | { |
---|