Fix a bug: the parser can't parse the array that it's item type is a map

jixingcn · jixingcn · commit ff305a39dbf5 · 2021-01-29T14:30:03.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 
-## 0.1.7 (2020/10/15)
+## 0.1.8 (2021-01-29)
+
+* Fix a bug: the parser can't parse the array that it's item type is a map
+
+## 0.1.7 (2020-10-15)
 
 * Supports the `KHR_lights_punctual`
 * Compile by github action
@@ -13,11 +17,11 @@
 
 * Fix some bugs
 
-## 0.1.4 (2018/11/5)
+## 0.1.4 (2018-11-5)
 
 * Support Android and iOS platforms
 
-## 0.0.1 (2017/12/5)
+## 0.0.1 (2017-12-5)
 
 ### Changes
 
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,15 +1,13 @@
-# The MIT License
+MIT License
 
-This software is released under the MIT license.
+Copyright (c) 2017-2021 Code 4 Game, Org. All Rights Reserved.
 
-Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
diff --git a/docs/conf.py b/docs/conf.py
@@ -18,8 +18,8 @@
 # -- Project information -----------------------------------------------------
 
 project = 'libgltf'
-copyright = '2020, Alex Chi'
-author = 'Alex Chi'
+copyright = '2021, Code 4 Game'
+author = 'Xing Ji'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/include/libgltf/libgltf.h b/include/libgltf/libgltf.h
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Code 4 Game, Org. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -660,7 +660,7 @@ namespace libgltf
         // The type of primitives to render.
         int32_t mode;
         // An array of Morph Targets, each  Morph Target is a dictionary mapping attributes (only `POSITION`, `NORMAL`, and `TANGENT` supported) to their deviations in the Morph Target.
-        std::vector<std::shared_ptr<SGlTFId>> targets;
+        std::vector<std::map<string_t, std::shared_ptr<SGlTFId>>> targets;
     };
 
     /*!
diff --git a/source/libgltf/common.cpp b/source/libgltf/common.cpp
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/common.h b/source/libgltf/common.h
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/extensions/google_draco.cpp b/source/libgltf/extensions/google_draco.cpp
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/extensions/google_draco.h b/source/libgltf/extensions/google_draco.h
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/file_loader.cpp b/source/libgltf/file_loader.cpp
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/file_loader.h b/source/libgltf/file_loader.h
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/gltf_loader.cpp b/source/libgltf/gltf_loader.cpp
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/gltf_loader.h b/source/libgltf/gltf_loader.h
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Code 4 Game, Org. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/libgltf.cpp b/source/libgltf/libgltf.cpp
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Code 4 Game, Org. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/libgltfloader.cpp b/source/libgltf/libgltfloader.cpp
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/libgltfparser.cpp b/source/libgltf/libgltfparser.cpp
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Code 4 Game, Org. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -2374,7 +2374,7 @@ namespace libgltf
         if (!_rData.data.targets.empty())
         {
             GLTFCharValue json_value;
-            if (!(TDataDoc<std::vector<std::shared_ptr<SGlTFId>>>(_rData.data.targets, _rData.doc) >> json_value)) return false;
+            if (!(TDataDoc<std::vector<std::map<string_t, std::shared_ptr<SGlTFId>>>>(_rData.data.targets, _rData.doc) >> json_value)) return false;
             _JsonValue.AddMember(GLTFTEXT("targets"), json_value, _rData.doc->GetAllocator());
         }
         return true;
diff --git a/source/libgltf/libgltfparser.h b/source/libgltf/libgltfparser.h
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Code 4 Game, Org. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/libgltfpch.h b/source/libgltf/libgltfpch.h
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/utility.cpp b/source/libgltf/utility.cpp
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/libgltf/utility.h b/source/libgltf/utility.h
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/runtest/runtest.cpp b/source/runtest/runtest.cpp
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  * 
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/source/runtest/runtest.h b/source/runtest/runtest.h
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  * 
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/tools/batch/codes/libgltf.license.h b/tools/batch/codes/libgltf.license.h
@@ -1,7 +1,7 @@
 /*
  * This software is released under the MIT license.
  *
- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization
+ * Copyright (c) 2017-2021 Code 4 Game, Org. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
diff --git a/tools/jsonschematoc11/c11types/c11typearray.py b/tools/jsonschematoc11/c11types/c11typearray.py
@@ -10,10 +10,15 @@ def __init__(self):
     def buildC11Type(cls, schemaValue):
         c11Type = None
         schemaValueType = None
+        variableSchemaValue = schemaValue
         if u'type' in schemaValue:
             schemaValueType = schemaValue[u'type']
+            if schemaValueType == u'object' and u'additionalProperties' in schemaValue:
+                schemaValueType = u'map'
+                variableSchemaValue = schemaValue[u'additionalProperties']
         elif u'$ref' in schemaValue:
             schemaValueType = schemaValue[u'$ref']
+
         if schemaValueType == u'bool' or schemaValueType == u'boolean':
             from .c11typebool import C11TypeBool
             c11Type = C11TypeBool()
@@ -28,6 +33,10 @@ def buildC11Type(cls, schemaValue):
             c11Type = C11TypeString()
         elif schemaValueType == u'array':
             c11Type = C11TypeArray()
+        elif schemaValueType == u'map':
+            from .c11typemap import C11TypeMap
+            c11Type = C11TypeMap()
+            c11Type.setItemSchema(variableSchemaValue)
         if c11Type is None:
             from .c11typestruct import C11TypeStruct
             c11Type = C11TypeStruct()
@@ -46,7 +55,8 @@ def setItemSchema(self, schemaValue):
 
     def revise(self, c11Types):
         from .c11typestruct import C11TypeStruct
-        if not isinstance(self.c11Type, C11TypeStruct):
+        from .c11typemap import C11TypeMap
+        if not isinstance(self.c11Type, C11TypeStruct) and not isinstance(self.c11Type, C11TypeMap):
             return (0, None)
         schemaValueType = None
         schemaValueItem = None
@@ -56,14 +66,16 @@ def revise(self, c11Types):
             schemaValueItem = self.schemaValue
         if schemaValueItem is None:
             return (1, u'Can\'t find the items in schema of array')
-        if u'$ref' in schemaValueItem:
+        elif u'$ref' in schemaValueItem:
             schemaValueType = schemaValueItem[u'$ref']
         if schemaValueType not in c11Types:
             if u'additionalProperties' in schemaValueItem:
                 schemaValueAdditionalProperties = schemaValueItem[u'additionalProperties']
                 if u'$ref' in schemaValueAdditionalProperties:
                     schemaValueType = schemaValueAdditionalProperties[u'$ref']
-        if schemaValueType in c11Types:
+        if isinstance(self.c11Type, C11TypeMap):
+            self.c11Type.revise(c11Types)
+        elif schemaValueType in c11Types:
             self.c11Type = c11Types[schemaValueType]
         else:
             from .c11typenone import C11TypeNone
diff --git a/tools/jsonschematoc11/c11types/c11typemap.py b/tools/jsonschematoc11/c11types/c11typemap.py
@@ -49,23 +49,14 @@ def revise(self, c11Types):
         if not isinstance(self.c11Type, C11TypeStruct):
             return (0, None)
         schemaValueType = None
-        schemaValueItem = self.schemaValue
-        if u'items' in self.schemaValue:
-            schemaValueItem = self.schemaValue[u'items']
-        if schemaValueItem == None:
-            return (1, u'Can\'t find the items in schema of array')
-        if u'$ref' in schemaValueItem:
-            schemaValueType = schemaValueItem[u'$ref']
-        if schemaValueType not in c11Types:
-            if u'additionalProperties' in schemaValueItem:
-                schemaValueAdditionalProperties = schemaValueItem[u'additionalProperties']
-                if u'$ref' in schemaValueAdditionalProperties:
-                    schemaValueType = schemaValueAdditionalProperties[u'$ref']
+        if u'$ref' in self.schemaValue:
+            schemaValueType = self.schemaValue[u'$ref']
         if schemaValueType in c11Types:
             self.c11Type = c11Types[schemaValueType]
         else:
             from .c11typenone import C11TypeNone
             self.c11Type = C11TypeNone()
+        self.c11Type.revise(c11Types)
         return (0, u'')
 
     def codeTypeName(self, withDeclare=False, asVariable=False, withDocument=False):

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* This software is released under the MIT license.`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2017-2020 Alex Chi, The Code 4 Game Organization`
	`4`	`+ * Copyright (c) 2017-2021 Alex Chi, The Code 4 Game Organization`
`5`	`5`	`*`
`6`	`6`	`* Permission is hereby granted, free of charge, to any person obtaining a copy of`
`7`	`7`	`* this software and associated documentation files (the "Software"), to deal in`