diff options
Diffstat (limited to 'ddl/out/java/LambdaCube/Mesh')
-rw-r--r-- | ddl/out/java/LambdaCube/Mesh/JSON.java | 17 | ||||
-rw-r--r-- | ddl/out/java/LambdaCube/Mesh/Mesh.java | 2 | ||||
-rw-r--r-- | ddl/out/java/LambdaCube/Mesh/MeshAttribute.java | 2 | ||||
-rw-r--r-- | ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java | 2 |
4 files changed, 16 insertions, 7 deletions
diff --git a/ddl/out/java/LambdaCube/Mesh/JSON.java b/ddl/out/java/LambdaCube/Mesh/JSON.java index f878c4e..b19b4e2 100644 --- a/ddl/out/java/LambdaCube/Mesh/JSON.java +++ b/ddl/out/java/LambdaCube/Mesh/JSON.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.232726000000Z | 2 | // 2016-04-01T16:25:35.222504000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
@@ -41,9 +41,9 @@ public class JSON { | |||
41 | 41 | ||
42 | public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { | 42 | public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { |
43 | switch (type) { | 43 | switch (type) { |
44 | case Int32: return (Integer)rawObj; | 44 | case Int32: return ((Number)rawObj).intValue(); |
45 | case Word32: return (Integer)rawObj; | 45 | case Word32: return ((Number)rawObj).intValue(); |
46 | case Float: return (Float)rawObj; | 46 | case Float: return ((Number)rawObj).floatValue(); |
47 | case String: return (String)rawObj; | 47 | case String: return (String)rawObj; |
48 | case V2_Float: { | 48 | case V2_Float: { |
49 | JSONObject obj = (JSONObject)rawObj; | 49 | JSONObject obj = (JSONObject)rawObj; |
@@ -387,6 +387,7 @@ public class JSON { | |||
387 | return obj; | 387 | return obj; |
388 | } | 388 | } |
389 | 389 | ||
390 | case Int32: { return rawObj; } | ||
390 | case Word32: { return rawObj; } | 391 | case Word32: { return rawObj; } |
391 | case Float: { return rawObj; } | 392 | case Float: { return rawObj; } |
392 | case String: { return rawObj; } | 393 | case String: { return rawObj; } |
@@ -438,6 +439,14 @@ public class JSON { | |||
438 | obj.put("w", toJSON(Type.V4_Float,v.w)); | 439 | obj.put("w", toJSON(Type.V4_Float,v.w)); |
439 | return obj; | 440 | return obj; |
440 | } | 441 | } |
442 | case Array_Int32: { | ||
443 | ArrayList<Integer> v = (ArrayList<Integer>)rawObj; | ||
444 | JSONArray obj = new JSONArray(); | ||
445 | for(Integer i : v) { | ||
446 | obj.put(toJSON(Type.Int32,i)); | ||
447 | } | ||
448 | return obj; | ||
449 | } | ||
441 | case Array_Word32: { | 450 | case Array_Word32: { |
442 | ArrayList<Integer> v = (ArrayList<Integer>)rawObj; | 451 | ArrayList<Integer> v = (ArrayList<Integer>)rawObj; |
443 | JSONArray obj = new JSONArray(); | 452 | JSONArray obj = new JSONArray(); |
diff --git a/ddl/out/java/LambdaCube/Mesh/Mesh.java b/ddl/out/java/LambdaCube/Mesh/Mesh.java index 8b62ab7..db5fc0a 100644 --- a/ddl/out/java/LambdaCube/Mesh/Mesh.java +++ b/ddl/out/java/LambdaCube/Mesh/Mesh.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.232726000000Z | 2 | // 2016-04-01T16:25:35.222504000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java b/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java index a29a371..a2982b3 100644 --- a/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java +++ b/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.232726000000Z | 2 | // 2016-04-01T16:25:35.222504000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java b/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java index f334a71..909e9bd 100644 --- a/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java +++ b/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.232726000000Z | 2 | // 2016-04-01T16:25:35.222504000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||