Revision f9e28248
Added by Leszek Koltunski over 3 years ago
src/main/java/org/distorted/objectlib/helpers/FactorySticker.java | ||
---|---|---|
184 | 184 |
|
185 | 185 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
186 | 186 |
|
187 |
private void drawCurrVertex(Canvas canvas, Paint paint, int color, int left, int top, float r, float stroke, float pX, float pY, float cX, float cY, float nX, float nY) |
|
187 |
private void drawCurrVertex(Canvas canvas, Paint paint, int color, int left, int top, float r, float stroke, |
|
188 |
float pX, float pY, float cX, float cY, float nX, float nY) |
|
188 | 189 |
{ |
189 | 190 |
pX = (0.5f+pX)*TEXTURE_HEIGHT; |
190 | 191 |
pY = (0.5f-pY)*TEXTURE_HEIGHT; |
... | ... | |
254 | 255 |
} |
255 | 256 |
else |
256 | 257 |
{ |
257 |
startAngle= computeAngle(aX,aY);
|
|
258 |
endAngle = computeAngle(-bX,-bY);
|
|
258 |
startAngle= computeAngle(-aX, aY);
|
|
259 |
endAngle = computeAngle(-bX, bY);
|
|
259 | 260 |
sweepAngle= endAngle-startAngle; |
260 | 261 |
if( sweepAngle<0 ) sweepAngle += 2*Math.PI; |
261 | 262 |
float C = (float)Math.cos(sweepAngle/2); |
src/main/java/org/distorted/objectlib/objects/TwistyBandagedGeneric.java | ||
---|---|---|
60 | 60 |
{ |
61 | 61 |
POS = new float[][] |
62 | 62 |
{ |
63 |
|
|
64 |
{-1.0f, +1.0f, +1.0f, |
|
65 |
-1.0f, +1.0f, +0.0f, |
|
66 |
-1.0f, +1.0f, -1.0f, |
|
67 |
-1.0f, 0.0f, +1.0f, |
|
68 |
-1.0f, 0.0f, +0.0f, |
|
69 |
-1.0f, 0.0f, -1.0f }, |
|
70 |
|
|
71 |
{-1.0f, -1.0f, +1.0f, |
|
72 |
-1.0f, -1.0f, +0.0f, |
|
73 |
-1.0f, -1.0f, -1.0f, |
|
74 |
0.0f, -1.0f, +1.0f, |
|
75 |
0.0f, -1.0f, +0.0f}, |
|
76 |
|
|
63 |
{-1.0f, +1.0f, +1.0f}, |
|
64 |
{-1.0f, +1.0f, +0.0f}, |
|
65 |
{-1.0f, +1.0f, -1.0f}, |
|
66 |
{-1.0f, 0.0f, +1.0f}, |
|
67 |
{-1.0f, 0.0f, +0.0f}, |
|
68 |
{-1.0f, 0.0f, -1.0f}, |
|
69 |
{-1.0f, -1.0f, +1.0f}, |
|
70 |
{-1.0f, -1.0f, +0.0f}, |
|
71 |
{-1.0f, -1.0f, -1.0f}, |
|
72 |
{ 0.0f, -1.0f, +1.0f}, |
|
73 |
{ 0.0f, -1.0f, +0.0f}, |
|
77 | 74 |
{ 0.0f, +1.0f, +1.0f}, |
78 | 75 |
{ 0.0f, +1.0f, +0.0f}, |
79 | 76 |
{ 0.0f, +1.0f, -1.0f}, |
80 | 77 |
{ 0.0f, 0.0f, +1.0f}, |
81 | 78 |
{ 0.0f, 0.0f, -1.0f}, |
82 | 79 |
|
83 |
{ 1.0f, +1.0f, +1.0f}, |
|
84 |
{ 1.0f, +1.0f, +0.0f}, |
|
80 |
{ 1.0f, +1.0f, +0.0f , |
|
81 |
1.0f, +0.0f, +1.0f , |
|
82 |
1.0f, 0.0f, +0.0f}, |
|
83 |
|
|
85 | 84 |
{ 1.0f, +1.0f, -1.0f}, |
86 |
{ 1.0f, 0.0f, +1.0f}, |
|
87 |
{ 1.0f, 0.0f, +0.0f}, |
|
88 |
{ 1.0f, -1.0f, +1.0f}, |
|
85 |
{ 1.0f, 1.0f, 1.0f}, |
|
89 | 86 |
|
90 |
{ 1.0f, 0.0f, -1.0f, |
|
91 |
1.0f, -1.0f, -1.0f, |
|
92 |
1.0f, -1.0f, +0.0f, |
|
93 |
0.0f, -1.0f, -1.0f }, |
|
87 |
{ 1.0f, -1.0f, +1.0f}, |
|
88 |
{ 1.0f, 0.0f, -1.0f}, |
|
89 |
{ 1.0f, -1.0f, -1.0f}, |
|
90 |
{ 1.0f, -1.0f, +0.0f}, |
|
91 |
{ 0.0f, -1.0f, -1.0f}, |
|
94 | 92 |
}; |
95 | 93 |
} |
96 | 94 |
return POS; |
Also available in: Unified diff
Bandaged 3x3: fix concave rounded corners.