Update scripts

Cesium3DTiles/generated/include/Cesium3DTiles/Tile.h

@@ -5,7 +5,6 @@
 #include "Cesium3DTiles/BoundingVolume.h"
 #include "Cesium3DTiles/Content.h"
 #include "Cesium3DTiles/Library.h"
-#include "Cesium3DTiles/Tile.h"
 
 #include <CesiumUtility/ExtensibleObject.h>
 

Cesium3DTilesReader/generated/src/TileJsonHandler.h

@@ -4,7 +4,6 @@
 
 #include "BoundingVolumeJsonHandler.h"
 #include "ContentJsonHandler.h"
-#include "TileJsonHandler.h"
 
 #include <Cesium3DTiles/Tile.h>
 #include <CesiumJsonReader/ArrayJsonHandler.h>

tools/generate-classes/generate.js

@@ -60,7 +60,7 @@ function generate(options, schema) {
 
   // Prevent header from including itself for recursive types like Tile
   headers = headers.filter((header) => {
-    return header !== `"${name}.h"`;
+    return header !== `"${namespace}/${name}.h"`;
   });
 
   headers.sort();
@@ -211,12 +211,7 @@ function generate(options, schema) {
         }
   `;
 
-  const readerHeaderOutputDir = path.join(
-    readerOutputDir,
-    "generated",
-    "src",
-    readerNamespace
-  );
+  const readerHeaderOutputDir = path.join(readerOutputDir, "generated", "src");
   fs.mkdirSync(readerHeaderOutputDir, { recursive: true });
 
   const readerHeaderOutputPath = path.join(
@@ -394,11 +389,13 @@ function getReaderIncludeFromName(name, readerNamespace) {
       pieces.groups.namespace,
       readerNamespace
     );
-    const includeStart = namespace === readerNamespace ? `"` : `<`;
-    const includeEnd = namespace === readerNamespace ? `"` : `>`;
-    return `${includeStart}${namespace}/${pieces.groups.name}JsonHandler.h${includeEnd}`;
+    if (namespace === readerNamespace) {
+      return `"${pieces.groups.name}JsonHandler.h"`;
+    } else {
+      return `<${namespace}/${pieces.groups.name}JsonHandler.h>`;
+    }
   } else {
-    return `"${readerNamespace}/${name}JsonHandler.h"`;
+    return `"${name}JsonHandler.h"`;
   }
 }
 

tools/generate-classes/generateRegisterExtensions.js

@@ -52,7 +52,7 @@ function generateRegisterExtensions(options) {
         // This file was generated by generate-classes.
         // DO NOT EDIT THIS FILE!
         
-        #include "${readerNamespace}/${filename}.h"
+        #include "${filename}.h"
         
         #include <CesiumJsonReader/ExtensionReaderContext.h>
 
@@ -64,7 +64,7 @@ function generateRegisterExtensions(options) {
         
         ${extensionClassNames
           .map((extensionClassName) => {
-            return `#include <${readerNamespace}/${extensionClassName}JsonHandler.h>`;
+            return `#include "${extensionClassName}JsonHandler.h"`;
           })
           .join("\n")}  
 
@@ -82,12 +82,7 @@ function generateRegisterExtensions(options) {
   
   `;
 
-  const readerHeaderOutputDir = path.join(
-    readerOutputDir,
-    "generated",
-    "src",
-    readerNamespace
-  );
+  const readerHeaderOutputDir = path.join(readerOutputDir, "generated", "src");
   fs.mkdirSync(readerHeaderOutputDir, { recursive: true });
 
   const headerOutputPath = path.join(readerHeaderOutputDir, `${filename}.h`);

tools/generate-classes/index.js

@@ -68,8 +68,7 @@ if (argv.oneHandlerFile) {
   const readerHeaderOutputDir = path.join(
     argv.readerOutput,
     "generated",
-    "src",
-    argv.readerNamespace
+    "src"
   );
   fs.mkdirSync(readerHeaderOutputDir, { recursive: true });
   const readerSourceOutputPath = path.join(

tools/generate-classes/resolveProperty.js

@@ -141,7 +141,7 @@ function resolveProperty(
           ...(makeOptional ? ["<optional>"] : []),
         ],
         readerType: `${type}JsonHandler`,
-        readerHeaders: [`"${readerNamespace}/${type}JsonHandler.h"`],
+        readerHeaders: [`"${type}JsonHandler.h"`],
         schemas: [itemSchema],
       };
     }