Revision cf93ea4e
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package org.distorted.objectlib.main; |
| 11 | 11 |
|
| 12 |
import java.io.InputStream; |
|
| 13 | 12 |
import java.lang.reflect.Constructor; |
| 14 | 13 |
import java.lang.reflect.InvocationTargetException; |
| 15 | 14 |
|
| ... | ... | |
| 186 | 185 |
|
| 187 | 186 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 188 | 187 |
|
| 189 |
public static TwistyObject create(int ordinal, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream meshStream)
|
|
| 188 |
public static TwistyObject create(int ordinal, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitAssets asset)
|
|
| 190 | 189 |
{
|
| 191 | 190 |
/* |
| 192 | 191 |
if( ordinal==MORP_2.ordinal() ) |
| 193 | 192 |
{
|
| 194 |
return new TwistyMorphix(objects[ordinal].mInitData,meshState,iconMode,quat,move,scale,meshStream);
|
|
| 193 |
return new TwistyMorphix(meshState,iconMode,quat,move,scale,objects[ordinal].mInitData,asset);
|
|
| 195 | 194 |
} |
| 196 | 195 |
*/ |
| 197 | 196 |
|
| ... | ... | |
| 206 | 205 |
if( cons.length==1 ) |
| 207 | 206 |
{
|
| 208 | 207 |
InitData data = objects[ordinal].mInitData; |
| 209 |
Object[] parameters = new Object[] { data,meshState,iconMode,quat,move,scale,meshStream };
|
|
| 208 |
Object[] parameters = new Object[] { meshState,iconMode,quat,move,scale,data,asset };
|
|
| 210 | 209 |
return (TwistyObject)cons[0].newInstance(parameters); |
| 211 | 210 |
} |
| 212 | 211 |
else |
Also available in: Unified diff
Introduce InitAssets. We'll use this later to pass on references to the tablebase file to the TwistyObject (so that it can use this for perfect scrambling)