Revision cf93ea4e
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 158 | 158 |
|
| 159 | 159 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 160 | 160 |
|
| 161 |
TwistyObject(InputStream jsonStream, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream meshStream)
|
|
| 161 |
TwistyObject(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitAssets assets)
|
|
| 162 | 162 |
{
|
| 163 | 163 |
try |
| 164 | 164 |
{
|
| 165 |
InputStream jsonStream = assets!=null ? assets.getJsonStream(): null; |
|
| 166 |
InputStream meshStream = assets!=null ? assets.getMeshStream(): null; |
|
| 165 | 167 |
JsonReader reader = new JsonReader(); |
| 166 | 168 |
reader.parseJsonFile(jsonStream); |
| 167 | 169 |
setReader(reader); |
| ... | ... | |
| 181 | 183 |
|
| 182 | 184 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 183 | 185 |
|
| 184 |
public TwistyObject(InitData data, int meshState, int iconMode, float size, Static4D quat, Static3D move, float scale, InputStream meshStream)
|
|
| 186 |
public TwistyObject(int meshState, int iconMode, float size, Static4D quat, Static3D move, float scale, InitData data, InitAssets assets)
|
|
| 185 | 187 |
{
|
| 186 | 188 |
mNumLayers = data.getNumLayers(); |
| 187 | 189 |
mSize = size; |
| 188 | 190 |
mInitData = data; |
| 191 |
InputStream meshStream = assets!=null ? assets.getMeshStream() : null; |
|
| 189 | 192 |
initialize(meshState,iconMode,quat,move,scale,meshStream,false); |
| 190 | 193 |
mError = false; |
| 191 | 194 |
mErrorString = null; |
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)