Update 4.3.7

nimadez · Aug 31, 2024 · e1a75da · e1a75da
1 parent 31de5a2
commit e1a75da
Show file tree

Hide file tree

Showing 94 changed files with 31 additions and 27 deletions.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -36,8 +36,8 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          # Upload entire repository
-          path: '.'
+          # Upload 'src' only
+          path: 'src'
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 All notable changes to this project will be documented in this file.
 
+## 4.3.7
+- New directory structure
+  - Improve project management and speed up the build time of github pages
+  - Everything updated accordingly, includes the update.py script
+
 ## 4.3.6
 - Update three.js to r168
 - New camera frame tools (frame to color group or selected voxels)

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 Voxel-based 3D modeling application<br>
 [https://nimadez.github.io/voxel-builder/](https://nimadez.github.io/voxel-builder/)
 
-```Version 4.3.6 Beta```<br>
+```Version 4.3.7 Beta```<br>
 [Changelog](https://github.com/nimadez/voxel-builder/blob/main/CHANGELOG.md)
 
 [Installation](https://github.com/nimadez/voxel-builder#installation)<br>
@@ -128,7 +128,7 @@ How to run Blender importer script?
 
 ## History
 ```
-↑ Stable x1.5 faster (optimized to current state)
+↑ New directory structure (x1.5 faster startup)
 ↑ Linux and Firefox ready
 ↑ Voxel engine updated to thin-instances (64k to 1M boost)
 ↑ Cut half precision (new scene)

diff --git a/electron.js b/electron.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "voxel-builder",
-    "version": "4.3.6",
+    "version": "4.3.7",
     "description": "Voxel-based 3D modeling application",
     "main": "electron.js",
     "scripts": {

diff --git a/server.js b/server.js
@@ -10,10 +10,10 @@ const PORT = 8011;
 
 http.createServer((req, res) => {
     const parsedUrl = url.parse(req.url, true);
-    let filePath = `.${parsedUrl.pathname}`;
+    let filePath = `src${parsedUrl.pathname}`;
 
     if (parsedUrl.pathname == '/')
-        filePath = './index.html';
+        filePath = 'src/index.html';
 
     fs.readFile(filePath, (err, data) => {
         if (err) {

diff --git a/assets/black.hdr → src/assets/black.hdr b/assets/black.hdr → src/assets/black.hdr
diff --git a/assets/bluenoise256.png → src/assets/bluenoise256.png b/assets/bluenoise256.png → src/assets/bluenoise256.png
diff --git a/assets/snow_field_2_puresky_1k.hdr → src/assets/snow_field_2_puresky_1k.hdr b/assets/snow_field_2_puresky_1k.hdr → src/assets/snow_field_2_puresky_1k.hdr
diff --git a/examples/model_menger.json → src/examples/model_menger.json b/examples/model_menger.json → src/examples/model_menger.json
diff --git a/examples/mv_charactercat_ephtracy.json → src/examples/mv_charactercat_ephtracy.json b/examples/mv_charactercat_ephtracy.json → src/examples/mv_charactercat_ephtracy.json
diff --git a/examples/mv_odyssey_kluchek.json → src/examples/mv_odyssey_kluchek.json b/examples/mv_odyssey_kluchek.json → src/examples/mv_odyssey_kluchek.json
diff --git a/examples/mv_skyscraper_kluchek.json → src/examples/mv_skyscraper_kluchek.json b/examples/mv_skyscraper_kluchek.json → src/examples/mv_skyscraper_kluchek.json
diff --git a/examples/mv_tankdestroyer_arsgametm.json → src/examples/mv_tankdestroyer_arsgametm.json b/examples/mv_tankdestroyer_arsgametm.json → src/examples/mv_tankdestroyer_arsgametm.json
diff --git a/examples/pt_cornellbox.json → src/examples/pt_cornellbox.json b/examples/pt_cornellbox.json → src/examples/pt_cornellbox.json
diff --git a/examples/pt_indirect.json → src/examples/pt_indirect.json b/examples/pt_indirect.json → src/examples/pt_indirect.json
diff --git a/examples/startup_legacy.json → src/examples/startup_legacy.json b/examples/startup_legacy.json → src/examples/startup_legacy.json
diff --git a/examples/startup_v4.json → src/examples/startup_v4.json b/examples/startup_v4.json → src/examples/startup_v4.json
diff --git a/examples/test_archinterior.json → src/examples/test_archinterior.json b/examples/test_archinterior.json → src/examples/test_archinterior.json
diff --git a/examples/test_rectadd.json → src/examples/test_rectadd.json b/examples/test_rectadd.json → src/examples/test_rectadd.json
diff --git a/examples/test_symmetry_even.json → src/examples/test_symmetry_even.json b/examples/test_symmetry_even.json → src/examples/test_symmetry_even.json
diff --git a/examples/test_symmetry_odd.json → src/examples/test_symmetry_odd.json b/examples/test_symmetry_odd.json → src/examples/test_symmetry_odd.json
diff --git a/examples/test_voxelization2d.json → src/examples/test_voxelization2d.json b/examples/test_voxelization2d.json → src/examples/test_voxelization2d.json
diff --git a/extras/asset-viewer/index.html → src/extras/asset-viewer/index.html b/extras/asset-viewer/index.html → src/extras/asset-viewer/index.html
diff --git a/extras/pixel-monk/index.html → src/extras/pixel-monk/index.html b/extras/pixel-monk/index.html → src/extras/pixel-monk/index.html
diff --git a/extras/vi2xel/index.html → src/extras/vi2xel/index.html b/extras/vi2xel/index.html → src/extras/vi2xel/index.html
diff --git a/index.html → src/index.html b/index.html → src/index.html
@@ -300,7 +300,7 @@
             <li><button onclick="window.open('https://nimadez.github.io/voxel-builder/extras/vi2xel', '_blank').focus();">VI²XEL</button></li>
             <li class="spacer"></li>
             <li class="about">
-                4.3.6 Beta 2024
+                4.3.7 Beta 2024
                 <br>&#8627; <a href="https://github.com/nimadez/voxel-builder/">GitHub</a>
                 <br>Developer
                 <br>&#8627; <a href="https://nimadez.github.io/">@nimadez</a>
@@ -720,7 +720,7 @@
     }
 }
 </script>
-<script src="src/modules/modules.js" type="module"></script>
-<script src="src/main.js"></script>
+<script src="modules/modules.js" type="module"></script>
+<script src="main.js"></script>
 </body>
 </html>
diff --git a/libs/addons/BufferGeometryUtils.js → src/libs/addons/BufferGeometryUtils.js b/libs/addons/BufferGeometryUtils.js → src/libs/addons/BufferGeometryUtils.js
diff --git a/libs/addons/OrbitControls.js → src/libs/addons/OrbitControls.js b/libs/addons/OrbitControls.js → src/libs/addons/OrbitControls.js
diff --git a/libs/addons/Pass.js → src/libs/addons/Pass.js b/libs/addons/Pass.js → src/libs/addons/Pass.js
diff --git a/libs/addons/RGBELoader.js → src/libs/addons/RGBELoader.js b/libs/addons/RGBELoader.js → src/libs/addons/RGBELoader.js
diff --git a/libs/addons/SimplexNoise.js → src/libs/addons/SimplexNoise.js b/libs/addons/SimplexNoise.js → src/libs/addons/SimplexNoise.js
diff --git a/libs/addons/WorkerPool.js → src/libs/addons/WorkerPool.js b/libs/addons/WorkerPool.js → src/libs/addons/WorkerPool.js
diff --git a/libs/babylon.gui.min.js → src/libs/babylon.gui.min.js b/libs/babylon.gui.min.js → src/libs/babylon.gui.min.js
diff --git a/libs/babylon.inspector.bundle.js → src/libs/babylon.inspector.bundle.js b/libs/babylon.inspector.bundle.js → src/libs/babylon.inspector.bundle.js
diff --git a/libs/babylon.js → src/libs/babylon.js b/libs/babylon.js → src/libs/babylon.js
diff --git a/libs/babylonjs.loaders.min.js → src/libs/babylonjs.loaders.min.js b/libs/babylonjs.loaders.min.js → src/libs/babylonjs.loaders.min.js
diff --git a/libs/babylonjs.materials.min.js → src/libs/babylonjs.materials.min.js b/libs/babylonjs.materials.min.js → src/libs/babylonjs.materials.min.js
diff --git a/libs/babylonjs.serializers.min.js → src/libs/babylonjs.serializers.min.js b/libs/babylonjs.serializers.min.js → src/libs/babylonjs.serializers.min.js
diff --git a/libs/three-mesh-bvh.module.js → src/libs/three-mesh-bvh.module.js b/libs/three-mesh-bvh.module.js → src/libs/three-mesh-bvh.module.js
diff --git a/libs/three.module.min.js → src/libs/three.module.min.js b/libs/three.module.min.js → src/libs/three.module.min.js
diff --git a/libs/websockets/__init__.py → src/libs/websockets/__init__.py b/libs/websockets/__init__.py → src/libs/websockets/__init__.py
diff --git a/libs/websockets/__main__.py → src/libs/websockets/__main__.py b/libs/websockets/__main__.py → src/libs/websockets/__main__.py
diff --git a/libs/websockets/asyncio/__init__.py → src/libs/websockets/asyncio/__init__.py b/libs/websockets/asyncio/__init__.py → src/libs/websockets/asyncio/__init__.py
diff --git a/libs/websockets/asyncio/async_timeout.py → src/libs/websockets/asyncio/async_timeout.py b/libs/websockets/asyncio/async_timeout.py → src/libs/websockets/asyncio/async_timeout.py
diff --git a/libs/websockets/asyncio/client.py → src/libs/websockets/asyncio/client.py b/libs/websockets/asyncio/client.py → src/libs/websockets/asyncio/client.py
diff --git a/libs/websockets/asyncio/compatibility.py → src/libs/websockets/asyncio/compatibility.py b/libs/websockets/asyncio/compatibility.py → src/libs/websockets/asyncio/compatibility.py
diff --git a/libs/websockets/asyncio/connection.py → src/libs/websockets/asyncio/connection.py b/libs/websockets/asyncio/connection.py → src/libs/websockets/asyncio/connection.py
diff --git a/libs/websockets/asyncio/messages.py → src/libs/websockets/asyncio/messages.py b/libs/websockets/asyncio/messages.py → src/libs/websockets/asyncio/messages.py
diff --git a/libs/websockets/asyncio/server.py → src/libs/websockets/asyncio/server.py b/libs/websockets/asyncio/server.py → src/libs/websockets/asyncio/server.py
diff --git a/libs/websockets/auth.py → src/libs/websockets/auth.py b/libs/websockets/auth.py → src/libs/websockets/auth.py
diff --git a/libs/websockets/client.py → src/libs/websockets/client.py b/libs/websockets/client.py → src/libs/websockets/client.py
diff --git a/libs/websockets/connection.py → src/libs/websockets/connection.py b/libs/websockets/connection.py → src/libs/websockets/connection.py
diff --git a/libs/websockets/datastructures.py → src/libs/websockets/datastructures.py b/libs/websockets/datastructures.py → src/libs/websockets/datastructures.py
diff --git a/libs/websockets/exceptions.py → src/libs/websockets/exceptions.py b/libs/websockets/exceptions.py → src/libs/websockets/exceptions.py
diff --git a/libs/websockets/extensions/__init__.py → src/libs/websockets/extensions/__init__.py b/libs/websockets/extensions/__init__.py → src/libs/websockets/extensions/__init__.py
diff --git a/libs/websockets/extensions/base.py → src/libs/websockets/extensions/base.py b/libs/websockets/extensions/base.py → src/libs/websockets/extensions/base.py
diff --git a/...bsockets/extensions/permessage_deflate.py → ...bsockets/extensions/permessage_deflate.py b/...bsockets/extensions/permessage_deflate.py → ...bsockets/extensions/permessage_deflate.py
diff --git a/libs/websockets/frames.py → src/libs/websockets/frames.py b/libs/websockets/frames.py → src/libs/websockets/frames.py
diff --git a/libs/websockets/headers.py → src/libs/websockets/headers.py b/libs/websockets/headers.py → src/libs/websockets/headers.py
diff --git a/libs/websockets/http.py → src/libs/websockets/http.py b/libs/websockets/http.py → src/libs/websockets/http.py
diff --git a/libs/websockets/http11.py → src/libs/websockets/http11.py b/libs/websockets/http11.py → src/libs/websockets/http11.py
diff --git a/libs/websockets/imports.py → src/libs/websockets/imports.py b/libs/websockets/imports.py → src/libs/websockets/imports.py
diff --git a/libs/websockets/legacy/__init__.py → src/libs/websockets/legacy/__init__.py b/libs/websockets/legacy/__init__.py → src/libs/websockets/legacy/__init__.py
diff --git a/libs/websockets/legacy/auth.py → src/libs/websockets/legacy/auth.py b/libs/websockets/legacy/auth.py → src/libs/websockets/legacy/auth.py
diff --git a/libs/websockets/legacy/client.py → src/libs/websockets/legacy/client.py b/libs/websockets/legacy/client.py → src/libs/websockets/legacy/client.py
diff --git a/libs/websockets/legacy/framing.py → src/libs/websockets/legacy/framing.py b/libs/websockets/legacy/framing.py → src/libs/websockets/legacy/framing.py
diff --git a/libs/websockets/legacy/handshake.py → src/libs/websockets/legacy/handshake.py b/libs/websockets/legacy/handshake.py → src/libs/websockets/legacy/handshake.py
diff --git a/libs/websockets/legacy/http.py → src/libs/websockets/legacy/http.py b/libs/websockets/legacy/http.py → src/libs/websockets/legacy/http.py
diff --git a/libs/websockets/legacy/protocol.py → src/libs/websockets/legacy/protocol.py b/libs/websockets/legacy/protocol.py → src/libs/websockets/legacy/protocol.py
diff --git a/libs/websockets/legacy/server.py → src/libs/websockets/legacy/server.py b/libs/websockets/legacy/server.py → src/libs/websockets/legacy/server.py
diff --git a/libs/websockets/protocol.py → src/libs/websockets/protocol.py b/libs/websockets/protocol.py → src/libs/websockets/protocol.py
diff --git a/libs/websockets/py.typed → src/libs/websockets/py.typed b/libs/websockets/py.typed → src/libs/websockets/py.typed
diff --git a/libs/websockets/server.py → src/libs/websockets/server.py b/libs/websockets/server.py → src/libs/websockets/server.py
diff --git a/libs/websockets/speedups.pyi → src/libs/websockets/speedups.pyi b/libs/websockets/speedups.pyi → src/libs/websockets/speedups.pyi
diff --git a/libs/websockets/streams.py → src/libs/websockets/streams.py b/libs/websockets/streams.py → src/libs/websockets/streams.py
diff --git a/libs/websockets/sync/__init__.py → src/libs/websockets/sync/__init__.py b/libs/websockets/sync/__init__.py → src/libs/websockets/sync/__init__.py
diff --git a/libs/websockets/sync/client.py → src/libs/websockets/sync/client.py b/libs/websockets/sync/client.py → src/libs/websockets/sync/client.py
diff --git a/libs/websockets/sync/connection.py → src/libs/websockets/sync/connection.py b/libs/websockets/sync/connection.py → src/libs/websockets/sync/connection.py
diff --git a/libs/websockets/sync/messages.py → src/libs/websockets/sync/messages.py b/libs/websockets/sync/messages.py → src/libs/websockets/sync/messages.py
diff --git a/libs/websockets/sync/server.py → src/libs/websockets/sync/server.py b/libs/websockets/sync/server.py → src/libs/websockets/sync/server.py
diff --git a/libs/websockets/sync/utils.py → src/libs/websockets/sync/utils.py b/libs/websockets/sync/utils.py → src/libs/websockets/sync/utils.py
diff --git a/libs/websockets/typing.py → src/libs/websockets/typing.py b/libs/websockets/typing.py → src/libs/websockets/typing.py
diff --git a/libs/websockets/uri.py → src/libs/websockets/uri.py b/libs/websockets/uri.py → src/libs/websockets/uri.py
diff --git a/libs/websockets/utils.py → src/libs/websockets/utils.py b/libs/websockets/utils.py → src/libs/websockets/utils.py
diff --git a/libs/websockets/version.py → src/libs/websockets/version.py b/libs/websockets/version.py → src/libs/websockets/version.py
diff --git a/src/main.js b/src/main.js
@@ -4191,7 +4191,7 @@ function Memory() {
 function Project(scene) {
     function serializeScene(voxels, meshes) {
         const json = {
-            version: "Voxel Builder 4.3.6",
+            version: "Voxel Builder 4.3.7",
             project: {
                 name: "name",
                 voxels: builder.voxels.length,

diff --git a/manifest.webmanifest → src/manifest.webmanifest b/manifest.webmanifest → src/manifest.webmanifest
diff --git a/src/modules/modules.js b/src/modules/modules.js
@@ -6,12 +6,12 @@
 import { bakery } from './bakery/bakery.js';
 import { pt } from './pathtracer/pathtracer.js';
 import { rc, voxelizeMesh, voxelizeBake } from './raycaster/raycaster.js';
-import { WorkerPool } from '../../libs/addons/WorkerPool.js';
-import { SimplexNoise } from '../../libs/addons/SimplexNoise.js';
+import { WorkerPool } from '../libs/addons/WorkerPool.js';
+import { SimplexNoise } from '../libs/addons/SimplexNoise.js';
 
 const workerPool = new WorkerPool();
 workerPool.setWorkerCreator(() => {
-    const worker = new Worker('src/modules/worker/worker.js', { type: "module" });
+    const worker = new Worker('modules/worker/worker.js', { type: "module" });
     worker.postMessage({ id: 'init' });
     return worker;
 });

diff --git a/src/modules/pathtracer/pathtracer.js b/src/modules/pathtracer/pathtracer.js
@@ -546,13 +546,13 @@ export const pt = new Pathtracer();
 // Load assets
 
 
-await loadFile('src/modules/pathtracer/shaders/image.fs').then(data => {
+await loadFile('modules/pathtracer/shaders/image.fs').then(data => {
     imageFragment = `
         precision mediump samplerCube;
         ` + data;
 });
 
-await loadFile('src/modules/pathtracer/shaders/render.fs').then(data => {
+await loadFile('modules/pathtracer/shaders/render.fs').then(data => {
     renderFragment = `
         precision highp isampler2D;
         precision highp usampler2D;

diff --git a/src/modules/three.js b/src/modules/three.js
@@ -6,19 +6,19 @@
 import { BufferGeometry, Mesh } from 'three';
 import {
     computeBoundsTree, disposeBoundsTree, acceleratedRaycast
-} from '../../libs/three-mesh-bvh.module.js';
+} from '../libs/three-mesh-bvh.module.js';
 
 BufferGeometry.prototype.computeBoundsTree = computeBoundsTree;
 BufferGeometry.prototype.disposeBoundsTree = disposeBoundsTree;
 Mesh.prototype.raycast = acceleratedRaycast;
 
 export * as THREE from 'three';
-export { OrbitControls } from '../../libs/addons/OrbitControls.js';
-export { FullScreenQuad } from '../../libs/addons/Pass.js';
-export { mergeGeometries } from '../../libs/addons/BufferGeometryUtils.js';
-export { RGBELoader } from '../../libs/addons/RGBELoader.js';
+export { OrbitControls } from '../libs/addons/OrbitControls.js';
+export { FullScreenQuad } from '../libs/addons/Pass.js';
+export { mergeGeometries } from '../libs/addons/BufferGeometryUtils.js';
+export { RGBELoader } from '../libs/addons/RGBELoader.js';
 export {
     MeshBVHUniformStruct, //MeshBVH, CENTER, SAH
     FloatVertexAttributeTexture, //UIntVertexAttributeTexture
     shaderStructs, shaderIntersectFunction //shaderDistanceFunction
-} from '../../libs/three-mesh-bvh.module.js';
+} from '../libs/three-mesh-bvh.module.js';
diff --git a/user/startup.json → src/user/startup.json b/user/startup.json → src/user/startup.json
diff --git a/user/user.js → src/user/user.js b/user/user.js → src/user/user.js
diff --git a/update.py b/update.py
@@ -10,7 +10,7 @@
 
 
 VBUILDER = 'https://github.com/nimadez/voxel-builder/archive/refs/heads/main.zip'
-EXCLUDE = [ "voxel-builder-main", "electron", "user.backup" ]
+EXCLUDE = [ "voxel-builder-main", "electron", ".user_backup" ]
 run_bat = """@echo off
 title Voxel Builder
 start "" electron\electron .
@@ -22,15 +22,14 @@
 def main():
     DIR_SRC = cwd + '/voxel-builder-main'
     DIR_DST = cwd
-    DIR_USR = cwd + '/user'
-    DIR_BKP = DIR_USR + '.backup'
+    DIR_USR = cwd + '/src/user'
+    DIR_BKP = cwd + '/.user_backup'
 
     remove_directory(DIR_SRC)
 
     try:
         print("Connecting to GitHub...")
         downloadZip(VBUILDER, DIR_DST)
-        os.system("cls")
     except:
         input("Error: Unable to fetch GitHub repository, check your internet connection.")
         sys.exit(0)