From 26546080eee5b5775a3f660e49cdb4281a16e2bf Mon Sep 17 00:00:00 2001 From: nimadez <111365948+nimadez@users.noreply.github.com> Date: Tue, 24 Sep 2024 13:15:36 +0330 Subject: [PATCH] Update 4.4.8 --- README.md | 1 + package.json | 2 +- {src/libs => scripts}/websockets/__init__.py | 0 {src/libs => scripts}/websockets/__main__.py | 0 .../websockets/asyncio/__init__.py | 0 .../websockets/asyncio/async_timeout.py | 0 .../websockets/asyncio/client.py | 0 .../websockets/asyncio/compatibility.py | 0 .../websockets/asyncio/connection.py | 0 .../websockets/asyncio/messages.py | 0 .../websockets/asyncio/server.py | 0 {src/libs => scripts}/websockets/auth.py | 0 {src/libs => scripts}/websockets/client.py | 0 .../libs => scripts}/websockets/connection.py | 0 .../websockets/datastructures.py | 0 .../libs => scripts}/websockets/exceptions.py | 0 .../websockets/extensions/__init__.py | 0 .../websockets/extensions/base.py | 0 .../extensions/permessage_deflate.py | 0 {src/libs => scripts}/websockets/frames.py | 0 {src/libs => scripts}/websockets/headers.py | 0 {src/libs => scripts}/websockets/http.py | 0 {src/libs => scripts}/websockets/http11.py | 0 {src/libs => scripts}/websockets/imports.py | 0 .../websockets/legacy/__init__.py | 0 .../websockets/legacy/auth.py | 0 .../websockets/legacy/client.py | 0 .../websockets/legacy/framing.py | 0 .../websockets/legacy/handshake.py | 0 .../websockets/legacy/http.py | 0 .../websockets/legacy/protocol.py | 0 .../websockets/legacy/server.py | 0 {src/libs => scripts}/websockets/protocol.py | 0 {src/libs => scripts}/websockets/py.typed | 0 {src/libs => scripts}/websockets/server.py | 0 {src/libs => scripts}/websockets/speedups.pyi | 0 {src/libs => scripts}/websockets/streams.py | 0 .../websockets/sync/__init__.py | 0 .../websockets/sync/client.py | 0 .../websockets/sync/connection.py | 0 .../websockets/sync/messages.py | 0 .../websockets/sync/server.py | 0 .../libs => scripts}/websockets/sync/utils.py | 0 {src/libs => scripts}/websockets/typing.py | 0 {src/libs => scripts}/websockets/uri.py | 0 {src/libs => scripts}/websockets/utils.py | 0 {src/libs => scripts}/websockets/version.py | 0 scripts/ws-connect.py | 1 - src/index.html | 28 +- src/main.js | 5585 +---------------- src/modules/babylon.js | 32 +- src/modules/bakery/bakery.js | 2 +- src/modules/core.js | 5550 ++++++++++++++++ src/modules/generator/generator.js | 2 +- src/modules/interfaces/hover.js | 4 +- src/modules/modules.js | 1 + src/modules/raycaster/raycaster.js | 2 +- src/modules/raycaster/voxelizer.js | 6 +- src/modules/sandbox/sandbox.js | 22 +- src/modules/three.js | 1 + src/modules/websockets/client.js | 2 +- src/user/user.js | 5 +- 62 files changed, 5629 insertions(+), 5617 deletions(-) rename {src/libs => scripts}/websockets/__init__.py (100%) rename {src/libs => scripts}/websockets/__main__.py (100%) rename {src/libs => scripts}/websockets/asyncio/__init__.py (100%) rename {src/libs => scripts}/websockets/asyncio/async_timeout.py (100%) rename {src/libs => scripts}/websockets/asyncio/client.py (100%) rename {src/libs => scripts}/websockets/asyncio/compatibility.py (100%) rename {src/libs => scripts}/websockets/asyncio/connection.py (100%) rename {src/libs => scripts}/websockets/asyncio/messages.py (100%) rename {src/libs => scripts}/websockets/asyncio/server.py (100%) rename {src/libs => scripts}/websockets/auth.py (100%) rename {src/libs => scripts}/websockets/client.py (100%) rename {src/libs => scripts}/websockets/connection.py (100%) rename {src/libs => scripts}/websockets/datastructures.py (100%) rename {src/libs => scripts}/websockets/exceptions.py (100%) rename {src/libs => scripts}/websockets/extensions/__init__.py (100%) rename {src/libs => scripts}/websockets/extensions/base.py (100%) rename {src/libs => scripts}/websockets/extensions/permessage_deflate.py (100%) rename {src/libs => scripts}/websockets/frames.py (100%) rename {src/libs => scripts}/websockets/headers.py (100%) rename {src/libs => scripts}/websockets/http.py (100%) rename {src/libs => scripts}/websockets/http11.py (100%) rename {src/libs => scripts}/websockets/imports.py (100%) rename {src/libs => scripts}/websockets/legacy/__init__.py (100%) rename {src/libs => scripts}/websockets/legacy/auth.py (100%) rename {src/libs => scripts}/websockets/legacy/client.py (100%) rename {src/libs => scripts}/websockets/legacy/framing.py (100%) rename {src/libs => scripts}/websockets/legacy/handshake.py (100%) rename {src/libs => scripts}/websockets/legacy/http.py (100%) rename {src/libs => scripts}/websockets/legacy/protocol.py (100%) rename {src/libs => scripts}/websockets/legacy/server.py (100%) rename {src/libs => scripts}/websockets/protocol.py (100%) rename {src/libs => scripts}/websockets/py.typed (100%) rename {src/libs => scripts}/websockets/server.py (100%) rename {src/libs => scripts}/websockets/speedups.pyi (100%) rename {src/libs => scripts}/websockets/streams.py (100%) rename {src/libs => scripts}/websockets/sync/__init__.py (100%) rename {src/libs => scripts}/websockets/sync/client.py (100%) rename {src/libs => scripts}/websockets/sync/connection.py (100%) rename {src/libs => scripts}/websockets/sync/messages.py (100%) rename {src/libs => scripts}/websockets/sync/server.py (100%) rename {src/libs => scripts}/websockets/sync/utils.py (100%) rename {src/libs => scripts}/websockets/typing.py (100%) rename {src/libs => scripts}/websockets/uri.py (100%) rename {src/libs => scripts}/websockets/utils.py (100%) rename {src/libs => scripts}/websockets/version.py (100%) create mode 100644 src/modules/core.js diff --git a/README.md b/README.md index edd73cffe..564797b0a 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,7 @@ How to run Blender importer script? ## History ``` +↑ Initialize the core! ↑ Rendering was left to three and three-gpu-pathtracer ↑ ES6 (the original index.html playground was moved) ↑ x1.5 faster startup (2s to 350ms) diff --git a/package.json b/package.json index ac801ce13..4e455abdf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "voxel-builder", - "version": "4.4.7", + "version": "4.4.8", "description": "Voxel-based 3D modeling application", "main": "electron.js", "scripts": { diff --git a/src/libs/websockets/__init__.py b/scripts/websockets/__init__.py similarity index 100% rename from src/libs/websockets/__init__.py rename to scripts/websockets/__init__.py diff --git a/src/libs/websockets/__main__.py b/scripts/websockets/__main__.py similarity index 100% rename from src/libs/websockets/__main__.py rename to scripts/websockets/__main__.py diff --git a/src/libs/websockets/asyncio/__init__.py b/scripts/websockets/asyncio/__init__.py similarity index 100% rename from src/libs/websockets/asyncio/__init__.py rename to scripts/websockets/asyncio/__init__.py diff --git a/src/libs/websockets/asyncio/async_timeout.py b/scripts/websockets/asyncio/async_timeout.py similarity index 100% rename from src/libs/websockets/asyncio/async_timeout.py rename to scripts/websockets/asyncio/async_timeout.py diff --git a/src/libs/websockets/asyncio/client.py b/scripts/websockets/asyncio/client.py similarity index 100% rename from src/libs/websockets/asyncio/client.py rename to scripts/websockets/asyncio/client.py diff --git a/src/libs/websockets/asyncio/compatibility.py b/scripts/websockets/asyncio/compatibility.py similarity index 100% rename from src/libs/websockets/asyncio/compatibility.py rename to scripts/websockets/asyncio/compatibility.py diff --git a/src/libs/websockets/asyncio/connection.py b/scripts/websockets/asyncio/connection.py similarity index 100% rename from src/libs/websockets/asyncio/connection.py rename to scripts/websockets/asyncio/connection.py diff --git a/src/libs/websockets/asyncio/messages.py b/scripts/websockets/asyncio/messages.py similarity index 100% rename from src/libs/websockets/asyncio/messages.py rename to scripts/websockets/asyncio/messages.py diff --git a/src/libs/websockets/asyncio/server.py b/scripts/websockets/asyncio/server.py similarity index 100% rename from src/libs/websockets/asyncio/server.py rename to scripts/websockets/asyncio/server.py diff --git a/src/libs/websockets/auth.py b/scripts/websockets/auth.py similarity index 100% rename from src/libs/websockets/auth.py rename to scripts/websockets/auth.py diff --git a/src/libs/websockets/client.py b/scripts/websockets/client.py similarity index 100% rename from src/libs/websockets/client.py rename to scripts/websockets/client.py diff --git a/src/libs/websockets/connection.py b/scripts/websockets/connection.py similarity index 100% rename from src/libs/websockets/connection.py rename to scripts/websockets/connection.py diff --git a/src/libs/websockets/datastructures.py b/scripts/websockets/datastructures.py similarity index 100% rename from src/libs/websockets/datastructures.py rename to scripts/websockets/datastructures.py diff --git a/src/libs/websockets/exceptions.py b/scripts/websockets/exceptions.py similarity index 100% rename from src/libs/websockets/exceptions.py rename to scripts/websockets/exceptions.py diff --git a/src/libs/websockets/extensions/__init__.py b/scripts/websockets/extensions/__init__.py similarity index 100% rename from src/libs/websockets/extensions/__init__.py rename to scripts/websockets/extensions/__init__.py diff --git a/src/libs/websockets/extensions/base.py b/scripts/websockets/extensions/base.py similarity index 100% rename from src/libs/websockets/extensions/base.py rename to scripts/websockets/extensions/base.py diff --git a/src/libs/websockets/extensions/permessage_deflate.py b/scripts/websockets/extensions/permessage_deflate.py similarity index 100% rename from src/libs/websockets/extensions/permessage_deflate.py rename to scripts/websockets/extensions/permessage_deflate.py diff --git a/src/libs/websockets/frames.py b/scripts/websockets/frames.py similarity index 100% rename from src/libs/websockets/frames.py rename to scripts/websockets/frames.py diff --git a/src/libs/websockets/headers.py b/scripts/websockets/headers.py similarity index 100% rename from src/libs/websockets/headers.py rename to scripts/websockets/headers.py diff --git a/src/libs/websockets/http.py b/scripts/websockets/http.py similarity index 100% rename from src/libs/websockets/http.py rename to scripts/websockets/http.py diff --git a/src/libs/websockets/http11.py b/scripts/websockets/http11.py similarity index 100% rename from src/libs/websockets/http11.py rename to scripts/websockets/http11.py diff --git a/src/libs/websockets/imports.py b/scripts/websockets/imports.py similarity index 100% rename from src/libs/websockets/imports.py rename to scripts/websockets/imports.py diff --git a/src/libs/websockets/legacy/__init__.py b/scripts/websockets/legacy/__init__.py similarity index 100% rename from src/libs/websockets/legacy/__init__.py rename to scripts/websockets/legacy/__init__.py diff --git a/src/libs/websockets/legacy/auth.py b/scripts/websockets/legacy/auth.py similarity index 100% rename from src/libs/websockets/legacy/auth.py rename to scripts/websockets/legacy/auth.py diff --git a/src/libs/websockets/legacy/client.py b/scripts/websockets/legacy/client.py similarity index 100% rename from src/libs/websockets/legacy/client.py rename to scripts/websockets/legacy/client.py diff --git a/src/libs/websockets/legacy/framing.py b/scripts/websockets/legacy/framing.py similarity index 100% rename from src/libs/websockets/legacy/framing.py rename to scripts/websockets/legacy/framing.py diff --git a/src/libs/websockets/legacy/handshake.py b/scripts/websockets/legacy/handshake.py similarity index 100% rename from src/libs/websockets/legacy/handshake.py rename to scripts/websockets/legacy/handshake.py diff --git a/src/libs/websockets/legacy/http.py b/scripts/websockets/legacy/http.py similarity index 100% rename from src/libs/websockets/legacy/http.py rename to scripts/websockets/legacy/http.py diff --git a/src/libs/websockets/legacy/protocol.py b/scripts/websockets/legacy/protocol.py similarity index 100% rename from src/libs/websockets/legacy/protocol.py rename to scripts/websockets/legacy/protocol.py diff --git a/src/libs/websockets/legacy/server.py b/scripts/websockets/legacy/server.py similarity index 100% rename from src/libs/websockets/legacy/server.py rename to scripts/websockets/legacy/server.py diff --git a/src/libs/websockets/protocol.py b/scripts/websockets/protocol.py similarity index 100% rename from src/libs/websockets/protocol.py rename to scripts/websockets/protocol.py diff --git a/src/libs/websockets/py.typed b/scripts/websockets/py.typed similarity index 100% rename from src/libs/websockets/py.typed rename to scripts/websockets/py.typed diff --git a/src/libs/websockets/server.py b/scripts/websockets/server.py similarity index 100% rename from src/libs/websockets/server.py rename to scripts/websockets/server.py diff --git a/src/libs/websockets/speedups.pyi b/scripts/websockets/speedups.pyi similarity index 100% rename from src/libs/websockets/speedups.pyi rename to scripts/websockets/speedups.pyi diff --git a/src/libs/websockets/streams.py b/scripts/websockets/streams.py similarity index 100% rename from src/libs/websockets/streams.py rename to scripts/websockets/streams.py diff --git a/src/libs/websockets/sync/__init__.py b/scripts/websockets/sync/__init__.py similarity index 100% rename from src/libs/websockets/sync/__init__.py rename to scripts/websockets/sync/__init__.py diff --git a/src/libs/websockets/sync/client.py b/scripts/websockets/sync/client.py similarity index 100% rename from src/libs/websockets/sync/client.py rename to scripts/websockets/sync/client.py diff --git a/src/libs/websockets/sync/connection.py b/scripts/websockets/sync/connection.py similarity index 100% rename from src/libs/websockets/sync/connection.py rename to scripts/websockets/sync/connection.py diff --git a/src/libs/websockets/sync/messages.py b/scripts/websockets/sync/messages.py similarity index 100% rename from src/libs/websockets/sync/messages.py rename to scripts/websockets/sync/messages.py diff --git a/src/libs/websockets/sync/server.py b/scripts/websockets/sync/server.py similarity index 100% rename from src/libs/websockets/sync/server.py rename to scripts/websockets/sync/server.py diff --git a/src/libs/websockets/sync/utils.py b/scripts/websockets/sync/utils.py similarity index 100% rename from src/libs/websockets/sync/utils.py rename to scripts/websockets/sync/utils.py diff --git a/src/libs/websockets/typing.py b/scripts/websockets/typing.py similarity index 100% rename from src/libs/websockets/typing.py rename to scripts/websockets/typing.py diff --git a/src/libs/websockets/uri.py b/scripts/websockets/uri.py similarity index 100% rename from src/libs/websockets/uri.py rename to scripts/websockets/uri.py diff --git a/src/libs/websockets/utils.py b/scripts/websockets/utils.py similarity index 100% rename from src/libs/websockets/utils.py rename to scripts/websockets/utils.py diff --git a/src/libs/websockets/version.py b/scripts/websockets/version.py similarity index 100% rename from src/libs/websockets/version.py rename to scripts/websockets/version.py diff --git a/scripts/ws-connect.py b/scripts/ws-connect.py index 5279595f7..ef3f4675f 100644 --- a/scripts/ws-connect.py +++ b/scripts/ws-connect.py @@ -7,7 +7,6 @@ import os, sys, json, random, time, asyncio -sys.path.insert(1, os.path.dirname(os.path.dirname(os.path.realpath(__file__))) + '/src/libs') from websockets.server import serve if __import__('platform').system == 'Windows': # fix [WinError 10054] diff --git a/src/index.html b/src/index.html index 063699592..724804406 100644 --- a/src/index.html +++ b/src/index.html @@ -130,7 +130,7 @@ #hover .material-icons { font-size: 20px; } #palette { z-index: 400; display: none; background: #31394b30; position: absolute; right: 2px; top: 8px; bottom: 285px; padding-right: 1px; overflow-y: scroll; overflow-x: hidden; } #meshlist { z-index: 400; display: none; min-width: 62px; background: #31394b30; position: absolute; right: 2px; top: 8px; bottom: 5px; overflow-y: scroll; overflow-x: hidden; } - #meshlist .item_name { background: #3e4558; width: 62px; font-size: 10px; padding: 5px 2px 5px 2px; margin-bottom: 1px; border: 1px solid var(--borders); border-radius: 2px; text-align: center; } + #meshlist .item_name { background: #3e4558; width: 62px; font-size: 11px; padding: 6px 2px 6px 2px; margin-bottom: 2px; border: 1px solid var(--borders); border-radius: 2px; text-align: center; } #meshlist .item_name:hover { background: var(--btn-bg); color: orange; } #meshlist .item_name.mesh_select { background: var(--btn-bg); color: orange; } #marquee { z-index: 500; display: none; background: #00ffff20; border: dotted 2px aqua; position: fixed; } @@ -148,11 +148,11 @@ #menu-inscreen-bottom { z-index: 9; display: none; background: #30394740; padding: 2px; height: fit-content; left: 50%; bottom: 25px; transform: translateX(-50%); position: absolute; text-align: center; border-radius: 4px; } #menu-inscreen-bottom div { z-index: 9; width: 26px; color: #00ffffAA; font-size: 18px; font-weight: bold; text-shadow: 1px 1px 0 #14171b; text-align: center; cursor: pointer; background: none; border: none; } #menu-inscreen-bottom div i { font-size: 19px; color: aqua; opacity: 0.7; margin-top: -4px; } + #menu-inscreen-sandbox { z-index: 301; display: none; flex-direction: column; left: 5px; top: 122px; position: fixed; } + #menu-inscreen-sandbox button { width: 61px; height: 50px; } + #menu-inscreen-sandbox button i { font-size: 30px; } #colorpicker { z-index: 500; width: 45px; height: 32px; } #colorpicker :first-child { height: 32px; } - #sandbox_render { z-index: 301; display: none; flex-direction: column; left: 5px; top: 122px; position: fixed; } - #sandbox_render button { width: 61px; height: 50px; } - #sandbox_render button i { font-size: 30px; } #info { z-index: 2; display: none; background: #2c313a80; color: #97a5b880; font-size: 10px; position: absolute; padding: 2px; width: auto; bottom: 2px; left: 50%; transform: translate(-50%,0); text-align: center; pointer-events: none; } #info span { color: var(--white); letter-spacing: 0.05em; } #info_tool { z-index: 2; display: none; color: #97a5b890; letter-spacing: 0.05em; font-size: 11px; position: absolute; padding: 2px; width: auto; top: 78px; left: 50%; transform: translate(-50%,0); text-align: center; pointer-events: none; } @@ -197,7 +197,7 @@ #meshlist { scrollbar-color: steelblue transparent; } #meshlist .item_name { width: 65px; } #menu-inscreen-bottom { bottom: 22px; } - #sandbox_render { top: 155px; } + #menu-inscreen-sandbox { top: 155px; } } @@ -269,17 +269,18 @@
  • - 4.4.7 Beta 2024 + 4.4.8 Beta 2024
    ↳ GitHub
    ↳ Changelog
    Developer
    ↳ @nimadez -
  • EXTRAS
    • +
  • +