Skip to content

Commit 9d5afa6

Browse files
authored
Merge pull request #35 from MetacityTools/dev
Release v0.5.1
2 parents 2f07904 + 00b786c commit 9d5afa6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+857
-390
lines changed

README.md

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,36 @@ Currently:
2222
- GLTF (triangles only)
2323
- Metacity File Format (binary Studio export)
2424

25-
## Roadmap
26-
27-
The project is in active development. The roadmap is as follows:
28-
29-
---
30-
31-
## Backlog
32-
33-
These features are planned for the future, but not yet scheduled.
34-
35-
### Priority Backlog
36-
37-
- [ ] Shortcuts for tab switching in editor
38-
39-
### Backlog
40-
41-
- [ ] Loading GeoJSON
42-
- [ ] Loading IFC metadata loading (memory-efficiency???)
43-
- [ ] Frustum culling
44-
- [ ] Connect to on-line storage and model admin
45-
- [ ] Extract Utils to separate SDK form metacity editors
46-
- [ ] Optional interactivity - build BVH only if user opts-in to make the loaded models clickable
47-
- [ ] Optimize deleting models - partition model BVH nodes based on submodels's ids
48-
- [ ] Insert textured plane (location blueprints for reference)
49-
- [ ] Refactor General context - setting status messages, etc.
50-
- [ ] Add a button to open/hide the side panel
51-
- [ ] Do not allow keys to be empty in table view during conversion
52-
5325
---
5426

5527
## Planned Releases
5628

5729
These features are planned for the future, and scheduled for a specific release.
5830

59-
### v0.5.1
60-
31+
### v0.5.1 - Work in progress
32+
33+
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.
34+
35+
- [x] Dark mode
36+
- [x] Update import menu to allow importing multiple files at once, only separate models, tables, or reference planes
37+
- [x] FIX: glTF glitch composing transforms with parents insice scene graph
38+
- [x] FIX: coloring models when style changes - display live changes on save
39+
- [ ] Color in table view according to metadata amount
40+
- [x] Colorize model
41+
- [ ] Adjustable limit of metadata for coloring.git
42+
- [x] Heatmap legend
43+
- [x] Updated file extension (replacing .metacity with .mcmodel and .json.metactiy with .mcstyle), still supports the old extensions tho
44+
- [x] Tooltip on hover over model and labels in 3D
45+
- [x] FIX: Firefox handling mouse events for hover
46+
- [x] Refactor processing status - https://github.com/MetacityTools/Studio/issues/33
47+
- [x] Loading models based on param - base for https://github.com/MetacityTools/Studio/issues/22
48+
- [ ] Feedback - show notifications on the bottom of the screen
6149
- [ ] Projecting models onto models (2D onto 3D) - ✨WIP https://github.com/vojtatom/geometry
6250
- [ ] Loading points and lines from SHP
6351
- [ ] Export screenshot action
64-
- [ ] Tooltip on hover over model
65-
- [ ] Dark mode
52+
- [ ] Lock camera position (two buttons - pan and rotation)
6653

67-
### v0.5.0 - Work in progress
54+
### v0.5.0 - ✅ Released
6855

6956
⚠️ Breaking changes, old `.metacity` files will not be compatible.
7057
🧠 Call for consultation (TB planned, end of July 2023)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "metacity-studio",
33
"private": true,
4-
"version": "0.5.0",
4+
"version": "0.5.1",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",

studio/src/assets/index.css

Lines changed: 107 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ body,
1717
font-weight: 400;
1818

1919
color-scheme: light;
20-
color: #222;
21-
background-color: #fff;
2220

2321
font-synthesis: none;
2422
text-rendering: optimizeLegibility;
@@ -27,47 +25,25 @@ body,
2725
-webkit-text-size-adjust: 100%;
2826
}
2927

30-
@layer base {
28+
@layer components {
3129
input[type='number']::-webkit-outer-spin-button,
3230
input[type='number']::-webkit-inner-spin-button,
3331
input[type='number'] {
3432
-webkit-appearance: none;
3533
margin: 0;
3634
-moz-appearance: textfield !important;
3735
}
38-
}
3936

40-
@layer components {
41-
.disable-blur {
42-
-webkit-image-rendering: pixelated;
43-
-moz-image-rendering: pixelated;
44-
-o-image-rendering: pixelated;
45-
image-rendering: pixelated;
37+
.slider-thumb::-webkit-slider-thumb {
38+
@apply h-3 w-3 cursor-pointer appearance-none rounded-full bg-neutral-500;
4639
}
4740

48-
.text-upright {
49-
writing-mode: vertical-rl;
50-
text-orientation: upright;
41+
.slider-thumb::-moz-range-thumb {
42+
@apply h-3 w-3 cursor-pointer appearance-none rounded-full border-0 bg-neutral-500;
5143
}
5244

5345
input[type='range'] {
54-
@apply cursor-pointer appearance-none bg-transparent outline-none;
55-
}
56-
57-
input[type='range']::-webkit-slider-runnable-track {
58-
@apply rounded-full bg-neutral-300;
59-
}
60-
61-
input[type='range']::-webkit-slider-thumb {
62-
@apply h-4 w-4 appearance-none rounded-full bg-neutral-500;
63-
}
64-
65-
input[type='range']::-moz-range-track {
66-
@apply rounded-full bg-neutral-300;
67-
}
68-
69-
input[type='range']::-ms-track {
70-
@apply rounded-full bg-neutral-300;
46+
@apply slider-thumb my-3 h-1.5 w-full cursor-pointer appearance-none rounded-lg bg-neutral-200 accent-neutral-500 dark:bg-neutral-700 dark:accent-neutral-400;
7147
}
7248

7349
select {
@@ -100,16 +76,111 @@ body,
10076
background-size: 1rem 1rem;
10177
padding-right: 1.5rem;
10278
}
79+
}
80+
81+
@layer components {
82+
.disable-blur {
83+
-webkit-image-rendering: pixelated;
84+
-moz-image-rendering: pixelated;
85+
-o-image-rendering: pixelated;
86+
image-rendering: pixelated;
87+
}
88+
}
89+
90+
@layer components {
91+
.active-border {
92+
@apply border-amber-300 hover:border-amber-400 dark:border-amber-500 hover:dark:border-amber-400;
93+
}
94+
95+
.active-text {
96+
@apply text-amber-600 dark:text-amber-400;
97+
}
98+
99+
.active-no-hover {
100+
@apply active-text active-border bg-amber-100 dark:bg-amber-900;
101+
}
102+
103+
.active-no-background {
104+
@apply active-text active-border hover:text-amber-600 dark:hover:text-amber-400;
105+
}
106+
107+
.active {
108+
@apply active-no-hover active-no-background hover:bg-amber-200 dark:hover:bg-amber-700;
109+
}
110+
111+
.base-border {
112+
@apply border-neutral-200 dark:border-neutral-700;
113+
}
114+
115+
.base-border-hover {
116+
@apply hover:border-amber-400 dark:hover:border-amber-400;
117+
}
118+
119+
.base-text {
120+
@apply text-neutral-600 dark:text-neutral-400;
121+
}
122+
123+
.base-no-hover {
124+
@apply base-text base-border bg-white dark:bg-neutral-800;
125+
}
126+
127+
.base-no-background {
128+
@apply base-text base-border base-border-hover hover:text-amber-600 dark:hover:text-amber-400;
129+
}
130+
131+
.base {
132+
@apply base-no-hover base-no-background hover:bg-amber-200 dark:hover:bg-amber-700;
133+
}
134+
135+
.hierarchy {
136+
@apply hover:bg-neutral-100 dark:hover:bg-neutral-700;
137+
}
138+
139+
.hierarchy-part {
140+
@apply border-inherit bg-inherit text-inherit;
141+
}
142+
143+
.hierarchy-active {
144+
@apply bg-amber-100 text-amber-600 hover:bg-amber-200 dark:bg-amber-800 dark:text-amber-400 dark:hover:bg-amber-700;
145+
}
146+
147+
.tab-button {
148+
@apply flex flex-col items-center overflow-hidden overflow-ellipsis whitespace-nowrap border-l-4 p-4 text-center text-2xl outline-none;
149+
}
150+
151+
.tab-list {
152+
@apply bg-white;
153+
}
154+
155+
.mc-background {
156+
@apply bg-white dark:bg-neutral-800;
157+
}
158+
159+
.mc-border {
160+
@apply border-neutral-200 dark:border-neutral-700;
161+
}
162+
163+
.text-900 {
164+
@apply text-neutral-900 dark:text-white;
165+
}
166+
167+
.text-500 {
168+
@apply text-neutral-500 dark:text-neutral-400;
169+
}
170+
171+
.mc-text {
172+
@apply text-neutral-800 dark:text-neutral-200;
173+
}
103174

104-
.shadow-even {
105-
box-shadow: 0 4px 15px 0 rgba(0, 0, 0, 0.15);
175+
.table-th-color {
176+
@apply bg-neutral-100 text-neutral-500 dark:bg-neutral-800 dark:text-neutral-400;
106177
}
107178

108-
.shadow-big {
109-
box-shadow: 0 20px 70px 0 rgba(0, 0, 0, 0.15);
179+
.table-tr-color {
180+
@apply odd:bg-neutral-50 dark:bg-neutral-900 dark:odd:bg-neutral-800;
110181
}
111182

112-
.shadow-container:hover > * {
113-
@apply shadow-even;
183+
.table-td-action-color {
184+
@apply bg-neutral-100 text-neutral-400 dark:bg-neutral-800 dark:text-neutral-400;
114185
}
115186
}

0 commit comments

Comments
 (0)