Merge pull request #40 from MetacityTools/dev

Releasing 0.5.2

Author: vojtatom

.prettierrc

@@ -12,6 +12,9 @@
         "^@editor/(.*)$",
         "^@elements/(.*)$",
         "^@shared/(.*)$",
+        "^@data/(.*)$",
+        "^@context/(.*)$",
+        "^@hooks/(.*)$",
         "^@assets/(.*)$",
         "^[./]"
     ],

README.md

@@ -28,28 +28,38 @@ Currently:
 
 These features are planned for the future, and scheduled for a specific release.
 
-### v0.5.1 - Work in progress
+### v0.5.2 - Work in progress
+
+-   [x] Export screenshot action
+-   [x] Refactored Global context and processing status - https://github.com/MetacityTools/Studio/issues/33
+-   [x] Projecting models onto models (2D onto 3D) - https://github.com/MetacityTools/geometry.ts
+-   [x] Replace json style editor with something more user friendly
+    -   [x] Add a way to add custom styles
+    -   [ ] Switching colormaps for scalars
+    -   [x] Editable input for colors
+    -   [ ] Switching shaders for individual models
+    -   [ ] Randomize colors - default colormap
+-   [x] Feedback - show notifications on the bottom of the screen
+-   [x] Tables - add notification on data assignment
+-   [ ] Loading points and lines from SHP
+-   [ ] Lock camera position (two buttons - pan and rotation) + locking height during panning as in map
+
+### v0.5.1 - ✅ Released
 
 GLTF loader now assumes Y+ as up axis (as in Blender) and converts the models to Z+ up axis. This is not a breaking change, but it is necessary to make the models compatible with the rest of the world.
 
 -   [x] Dark mode
 -   [x] Update import menu to allow importing multiple files at once, only separate models, tables, or reference planes
 -   [x] FIX: glTF glitch composing transforms with parents insice scene graph
 -   [x] FIX: coloring models when style changes - display live changes on save
--   [ ] Color in table view according to metadata amount
+-   [x] Color in table view according to metadata amount
     -   [x] Colorize model
-    -   [ ] Adjustable limit of metadata for coloring.git
-    -   [x] Heatmap legend
+    -   [x] Heatmap legendg
 -   [x] Updated file extension (replacing .metacity with .mcmodel and .json.metactiy with .mcstyle), still supports the old extensions tho
 -   [x] Tooltip on hover over model and labels in 3D
 -   [x] FIX: Firefox handling mouse events for hover
 -   [x] Refactor processing status - https://github.com/MetacityTools/Studio/issues/33
 -   [x] Loading models based on param - base for https://github.com/MetacityTools/Studio/issues/22
--   [ ] Feedback - show notifications on the bottom of the screen
--   [ ] Projecting models onto models (2D onto 3D) - ✨WIP https://github.com/vojtatom/geometry
--   [ ] Loading points and lines from SHP
--   [ ] Export screenshot action
--   [ ] Lock camera position (two buttons - pan and rotation)
 
 ### v0.5.0 - ✅ Released
 

package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "metacity-studio",
     "private": true,
-    "version": "0.5.1",
+    "version": "0.5.2",
     "type": "module",
     "scripts": {
         "dev": "vite",
@@ -12,8 +12,10 @@
         "@headlessui/react": "^1.7.14",
         "@loaders.gl/core": "^3.3.3",
         "@loaders.gl/gltf": "^3.3.3",
+        "@metacity/geometry": "^1.0.0",
         "@monaco-editor/react": "^4.5.1",
-        "@vojtatom/csvts": "^0.1.0",
+        "@uiw/color-convert": "^1.3.3",
+        "@uiw/react-color": "^1.3.3",
         "allotment": "^1.18.1",
         "clsx": "^1.2.1",
         "colormap": "^2.3.2",
@@ -26,6 +28,7 @@
         "react-router-dom": "^6.9.0",
         "react18-json-view": "^0.0.8",
         "shpts": "^1.0.4",
+        "tablests": "^1.0.1",
         "uuid": "^9.0.0",
         "web-ifc": "0.0.39",
         "web-ifc-three": "0.0.123"
@@ -35,6 +38,7 @@
         "@types/colormap": "^2.3.1",
         "@types/node": "^18.16.14",
         "@types/react": "^18.0.28",
+        "@types/react-color": "^3.0.6",
         "@types/react-dom": "^18.0.11",
         "@types/three": "^0.150.0",
         "@types/uuid": "^9.0.1",

package.json

@@ -70,11 +70,19 @@ body,
     /* add chevron to select */
 
     select {
+        -webkit-appearance: none;
+        -moz-appearance: none;
+        appearance: none;
+        margin: 0;
         background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="20" fill="none" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 9l4 4 4-4"/></svg>');
         background-repeat: no-repeat;
         background-position: right 0.5rem center;
         background-size: 1rem 1rem;
         padding-right: 1.5rem;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
     }
 }
 
@@ -89,7 +97,7 @@ body,
 
 @layer components {
     .active-border {
-        @apply border-amber-300 hover:border-amber-400 dark:border-amber-500 hover:dark:border-amber-400;
+        @apply border-amber-300 hover:border-amber-400 dark:border-amber-700 hover:dark:border-amber-600;
     }
 
     .active-text {
@@ -113,7 +121,7 @@ body,
     }
 
     .base-border-hover {
-        @apply hover:border-amber-400 dark:hover:border-amber-400;
+        @apply hover:border-amber-400 dark:hover:border-amber-600;
     }
 
     .base-text {
@@ -183,4 +191,16 @@ body,
     .table-td-action-color {
         @apply bg-neutral-100 text-neutral-400 dark:bg-neutral-800 dark:text-neutral-400;
     }
+
+    .button-list-readonly {
+        @apply bg-neutral-200 dark:bg-neutral-700;
+    }
+
+    .button-list {
+        @apply button-list-readonly hover:bg-neutral-300 dark:hover:bg-neutral-600;
+    }
+
+    .button-list-no-highlite {
+        @apply hover:bg-neutral-100 dark:hover:bg-neutral-700;
+    }
 }

studio/src/assets/ikea.png

@@ -378,7 +378,6 @@ export class Camera {
 
         //Calculate the displacement and adjust the camera's position
         const displacement = vec3.sub(this.displacement, newTarPos, tarPos);
-        console.log(displacement);
         vec3.sub(this.position, this.position, displacement);
         vec3.sub(this.target, this.target, displacement);
         this.updateProjectionViewMatrix();