Project

General

Profile

« Previous | Next » 

Revision e1a86bf2

Added by Leszek Koltunski over 2 years ago

Move the main app to the 'J1M1' object creation mode, i.e. create them from the Json files and using the Dmesh fiels as well.

Make it possible for any app descending from the 'objectlib' to use any of the J0M0, J0M1, J1M0, J1M1 modes.

View differences:

src/main/java/org/distorted/objectlib/main/TwistyObject.java
146 146

  
147 147
  TwistyObject(InputStream jsonStream, Static4D quat, Static3D move, InputStream meshStream)
148 148
    {
149
    JsonReader reader = JsonReader.getInstance();
149
    JsonReader reader = new JsonReader();
150 150
    reader.parseJsonFile(jsonStream);
151 151
    setReader(reader);
152 152

  
......
1335 1335
    return mMovement;
1336 1336
    }
1337 1337

  
1338
///////////////////////////////////////////////////////////////////////////////////////////////////
1339

  
1340
  public String getShortName()
1341
    {
1342
    return getObjectType().name();
1343
    }
1344

  
1338 1345
///////////////////////////////////////////////////////////////////////////////////////////////////
1339 1346

  
1340 1347
  protected void setReader(JsonReader reader)

Also available in: Unified diff