Change imported data name and folder

pixelpicosean · Dec 20, 2020 · 8196c5f · 8196c5f
1 parent 074ebde
commit 8196c5f
Show file tree

Hide file tree

Showing 10 changed files with 9,963 additions and 9,963 deletions.
diff --git a/assets/image/default/_white_.png b/assets/image/default/_white_.png
diff --git a/assets/resources.json b/assets/resources.json
diff --git a/media/data.vt → media/data.tres b/media/data.vt → media/data.tres
diff --git a/media/data0.v → media/pack0.res b/media/data0.v → media/pack0.res
diff --git a/src/gen/data_debug.json b/src/gen/data_debug.json
diff --git a/assets/default_env.json → src/gen/default_env.json b/assets/default_env.json → src/gen/default_env.json
diff --git a/assets/meta.json → src/gen/meta.json b/assets/meta.json → src/gen/meta.json
@@ -4,6 +4,6 @@
     ],
     "json_files": [],
     "binary_files": [
-        "media/data0.v"
+        "media/pack0.res"
     ]
 }
diff --git a/assets/project.json → src/gen/project.json b/assets/project.json → src/gen/project.json
diff --git a/tool/convert_default_env.js b/tool/convert_default_env.js
@@ -77,6 +77,5 @@ module.exports.convert_default_env = (project_url) => {
         }
     }
 
-    const environment = Environment(resource);
-    fs.writeFileSync(project_url.replace(/\.tres/, '.json'), JSON.stringify(environment, null, 4));
+    return Environment(resource);
 };
diff --git a/tool/import_assets.js b/tool/import_assets.js
@@ -45,53 +45,54 @@ for (let k in resource_map) {
 if (compress_resources) {
     let res_str = JSON.stringify(final_resources, null, 2);
     let compressed = compress(res_str);
-    fs.writeFileSync(path.normalize(path.join(__dirname, '../media/data.vt')), compressed);
+    fs.writeFileSync(path.normalize(path.join(__dirname, '../media/data.tres')), compressed);
 } else {
-    fs.writeFileSync(path.normalize(path.join(__dirname, '../media/resources.json')), JSON.stringify(final_resources, null, 2));
+    fs.writeFileSync(path.normalize(path.join(__dirname, '../media/data.json')), JSON.stringify(final_resources, null, 4));
 }
 // - save to assets for development
-fs.writeFileSync(path.normalize(path.join(__dirname, '../assets/resources.json')), JSON.stringify(final_resources, null, 2));
+fs.writeFileSync(path.normalize(path.join(__dirname, '../src/gen/data_debug.json')), JSON.stringify(final_resources, null, 4));
 
 // 3. process and copy assets (DynamicFont, ...) to media
 console.log(`3. process assets`)
 // - default environment
-convert_default_env(path.normalize(path.join(__dirname, '../assets/default_env.tres')));
+let env = convert_default_env(path.normalize(path.join(__dirname, '../assets/default_env.tres')));
 // - bitmap font
 convert_bmfonts();
 // - dynamic font
 convert_dynamic_fonts();
 // - standalone images
 copy_standalone_images();
 // - json data
-const json_files = get_json_packs()
+let json_files = get_json_packs()
     .map((pack, i) => {
         // skip empty data
         if (pack.length === 0) return undefined;
 
-        let url = `media/data${i}.vt`;
+        let url = `media/pack${i}.tres`;
         let filepath = path.normalize(path.join(__dirname, `../${url}`));
         let compressed = compress(JSON.stringify(pack));
         fs.writeFileSync(filepath, compressed);
         return url;
     })
     .filter(e => !!e)
 // - binary data
-const binary_files = get_binary_packs()
+let binary_files = get_binary_packs()
     .map((pack, i) => {
-        let url = `media/data${i}.v`;
+        let url = `media/pack${i}.res`;
         let filepath = path.normalize(path.join(__dirname, `../${url}`));
         fs.writeFileSync(filepath, pack);
         return url;
     })
 
 
 // collect meta data, and save project file
-const resource_check_ignores = get_resource_check_ignores();
-fs.writeFileSync(path.normalize(path.join(__dirname, '../src/gen/meta.json')), JSON.stringify({
+fs.writeFileSync(path.resolve(__dirname, '../src/gen/default_env.json'), JSON.stringify(env, null, 4));
+let resource_check_ignores = get_resource_check_ignores();
+fs.writeFileSync(path.resolve(__dirname, '../src/gen/meta.json'), JSON.stringify({
     resource_check_ignores,
     json_files,
     binary_files,
 }, null, 4));
-fs.writeFileSync(path.normalize(path.join(__dirname, '../src/gen/project.json')), JSON.stringify(project), null, 4);
+fs.writeFileSync(path.resolve(__dirname, '../src/gen/project.json'), JSON.stringify(project, null, 4));
 
 console.log('[finished]')