Project

General

Profile

« Previous | Next » 

Revision c9c71c3f

Added by Leszek Koltunski over 2 years ago

Abstract out the TouchControl stuff in preparation for its new type - TouchControlShapeChanging.

View differences:

src/main/java/org/distorted/objectlib/json/JsonReader.java
25 25
import java.io.InputStreamReader;
26 26
import java.nio.charset.StandardCharsets;
27 27

  
28
import org.distorted.objectlib.movement.Movement;
28
import org.distorted.objectlib.touchcontrol.TouchControl;
29 29
import org.json.JSONArray;
30 30
import org.json.JSONException;
31 31
import org.json.JSONObject;
......
438 438
      {
439 439
      switch(mMovementType)
440 440
        {
441
        case Movement.MOVEMENT_TETRAHEDRON : mNumFaces = 4; break;
442
        case Movement.MOVEMENT_HEXAHEDRON  : mNumFaces = 6; break;
443
        case Movement.MOVEMENT_OCTAHEDRON  : mNumFaces = 8; break;
444
        case Movement.MOVEMENT_DODECAHEDRON: mNumFaces =12; break;
445
        default                            : android.util.Log.e("D", "Error in parseTouchcontrol");
441
        case TouchControl.TC_TETRAHEDRON : mNumFaces = 4; break;
442
        case TouchControl.TC_HEXAHEDRON  : mNumFaces = 6; break;
443
        case TouchControl.TC_OCTAHEDRON  : mNumFaces = 8; break;
444
        case TouchControl.TC_DODECAHEDRON: mNumFaces =12; break;
445
        default                          : android.util.Log.e("D", "Error in parseTouchcontrol");
446 446
        }
447 447
      }
448 448
    }

Also available in: Unified diff