{scope === 'ugc' ? : (
<>
- {theme !== 'classic' && (
+ {theme !== 'pink' && (
)}
diff --git a/resources/js/studio/theme.js b/resources/js/studio/theme.js
index c8b0efe..6ccec20 100644
--- a/resources/js/studio/theme.js
+++ b/resources/js/studio/theme.js
@@ -5,8 +5,11 @@ const KEY = 'studio_theme';
export const THEMES = [
['dark', 'Vortex'],
['classic', 'Classic'],
+ ['pink', 'Pink'],
];
+export const isLight = (name) => name === 'classic' || name === 'pink';
+
export const DEFAULT = 'dark';
const known = (name) => THEMES.some(([id]) => id === name);
diff --git a/scripts/fixtures/legacy-project.json b/scripts/fixtures/legacy-project.json
new file mode 100644
index 0000000..49c1b3b
--- /dev/null
+++ b/scripts/fixtures/legacy-project.json
@@ -0,0 +1,93 @@
+{
+ "project_id": "5f3b1c7a9d2e4801b6c5a4f39e0d7b21",
+ "parts": [
+ {
+ "name": "Baseplate",
+ "position": { "x": 0.0, "y": 0.0, "z": 0.0 },
+ "rotation": { "x": 0.0, "y": 0.0, "z": 0.0, "w": 1.0 },
+ "scale": { "x": 200.0, "y": 2.0, "z": 200.0 },
+ "color": { "r": 0.49019608, "g": 0.49019608, "b": 0.52156866, "a": 1.0 },
+ "material": "Metal",
+ "group": null,
+ "cast_shadow": false,
+ "anchored": false,
+ "can_collide": false,
+ "spawn_location": false,
+ "baseplate": true,
+ "truss": false,
+ "textures": [
+ { "face": "Top", "kind": "Studs" },
+ { "face": "Bottom", "kind": "Inlets" }
+ ]
+ },
+ {
+ "name": "SpawnLocation",
+ "position": { "x": 0.0, "y": 2.5, "z": 0.0 },
+ "rotation": { "x": 0.0, "y": 0.0, "z": 0.0, "w": 1.0 },
+ "scale": { "x": 6.0, "y": 1.0, "z": 6.0 },
+ "color": { "r": 0.3019608, "g": 0.72156864, "b": 0.29411766, "a": 1.0 },
+ "material": "Plastic",
+ "group": null,
+ "cast_shadow": true,
+ "anchored": true,
+ "can_collide": true,
+ "spawn_location": true,
+ "baseplate": false,
+ "truss": false,
+ "textures": []
+ },
+ {
+ "name": "Part",
+ "position": { "x": -8.0, "y": 4.0, "z": 3.0 },
+ "rotation": { "x": 0.0, "y": 0.38268343, "z": 0.0, "w": 0.9238795 },
+ "scale": { "x": 4.0, "y": 1.0, "z": 2.0 },
+ "color": { "r": 0.6392157, "g": 0.63529414, "b": 0.6431373, "a": 1.0 },
+ "material": "Wood",
+ "group": 0,
+ "cast_shadow": true,
+ "anchored": true,
+ "can_collide": true,
+ "spawn_location": false,
+ "baseplate": false,
+ "truss": false,
+ "textures": []
+ },
+ {
+ "name": "Part",
+ "position": { "x": -8.0, "y": 6.0, "z": 3.0 },
+ "rotation": { "x": 0.0, "y": 0.0, "z": 0.0, "w": 1.0 },
+ "scale": { "x": 4.0, "y": 1.0, "z": 2.0 },
+ "color": { "r": 0.6392157, "g": 0.63529414, "b": 0.6431373, "a": 0.5 },
+ "material": "Plastic",
+ "group": 0,
+ "cast_shadow": true,
+ "anchored": true,
+ "can_collide": true,
+ "spawn_location": false,
+ "baseplate": false,
+ "truss": false,
+ "textures": []
+ }
+ ],
+ "lights": [
+ {
+ "name": "Sun",
+ "position": { "x": 80.0, "y": 160.0, "z": 60.0 },
+ "rotation": { "x": -0.5311862, "y": 0.14004472, "z": 0.24240407, "w": 0.79934263 },
+ "color": { "r": 1.0, "g": 1.0, "b": 1.0, "a": 1.0 },
+ "illuminance": 10000.0,
+ "shadows_enabled": true
+ },
+ {
+ "name": "Fill",
+ "position": { "x": -40.0, "y": 60.0, "z": -20.0 },
+ "rotation": { "x": 0.0, "y": 0.0, "z": 0.0, "w": 1.0 },
+ "color": { "r": 0.8, "g": 0.85, "b": 1.0, "a": 1.0 },
+ "illuminance": 2500.0,
+ "shadows_enabled": false
+ }
+ ],
+ "groups": [
+ { "name": "Platform", "parent_group": null }
+ ]
+}
diff --git a/scripts/fixtures/studio-0-1-project.json b/scripts/fixtures/studio-0-1-project.json
deleted file mode 100644
index c37e9ce..0000000
--- a/scripts/fixtures/studio-0-1-project.json
+++ /dev/null
@@ -1,180 +0,0 @@
-{
- "project_id": "c32819ed4aa4a42511cefa9d974e3ce3",
- "parts": [
- {
- "name": "Baseplate",
- "position": {
- "x": 0.0,
- "y": -2.0,
- "z": 0.0
- },
- "rotation": {
- "x": 0.0,
- "y": 0.0,
- "z": 0.0,
- "w": 1.0
- },
- "scale": {
- "x": 255.0,
- "y": 4.0,
- "z": 255.0
- },
- "color": {
- "r": 0.49019608,
- "g": 0.49019608,
- "b": 0.49019608,
- "a": 1.0
- },
- "material": "Plastic",
- "group": null,
- "cast_shadow": true,
- "anchored": true,
- "can_collide": true,
- "spawn_location": false,
- "baseplate": true,
- "truss": false,
- "textures": [
- {
- "face": "Top",
- "kind": "Studs"
- },
- {
- "face": "Bottom",
- "kind": "Inlets"
- }
- ]
- },
- {
- "name": "SpawnLocation",
- "position": {
- "x": 0.0,
- "y": 0.5,
- "z": 0.0
- },
- "rotation": {
- "x": 0.0,
- "y": 0.0,
- "z": 0.0,
- "w": 1.0
- },
- "scale": {
- "x": 6.0,
- "y": 1.0,
- "z": 6.0
- },
- "color": {
- "r": 0.29411766,
- "g": 0.5921569,
- "b": 0.29411766,
- "a": 1.0
- },
- "material": "Plastic",
- "group": null,
- "cast_shadow": true,
- "anchored": true,
- "can_collide": true,
- "spawn_location": true,
- "baseplate": false,
- "truss": false,
- "textures": []
- },
- {
- "name": "Part",
- "position": {
- "x": 82.0,
- "y": 128.0,
- "z": 194.0
- },
- "rotation": {
- "x": 0.0,
- "y": 0.0,
- "z": 0.0,
- "w": 1.0
- },
- "scale": {
- "x": 1.0,
- "y": 1.0,
- "z": 1.0
- },
- "color": {
- "r": 0.99999994,
- "g": 0.99999994,
- "b": 0.99999994,
- "a": 1.0
- },
- "material": "Plastic",
- "group": 0,
- "cast_shadow": true,
- "anchored": false,
- "can_collide": true,
- "spawn_location": false,
- "baseplate": false,
- "truss": false,
- "textures": []
- },
- {
- "name": "Part",
- "position": {
- "x": 82.0,
- "y": 128.0,
- "z": 194.0
- },
- "rotation": {
- "x": 0.0,
- "y": 0.0,
- "z": 0.0,
- "w": 1.0
- },
- "scale": {
- "x": 1.0,
- "y": 1.0,
- "z": 1.0
- },
- "color": {
- "r": 0.99999994,
- "g": 0.99999994,
- "b": 0.99999994,
- "a": 1.0
- },
- "material": "Plastic",
- "group": 0,
- "cast_shadow": true,
- "anchored": false,
- "can_collide": true,
- "spawn_location": false,
- "baseplate": false,
- "truss": false,
- "textures": []
- }
- ],
- "lights": [
- {
- "name": "Light",
- "position": {
- "x": 50.0,
- "y": 80.0,
- "z": 30.0
- },
- "rotation": {
- "x": -0.39447272,
- "y": 0.43916786,
- "z": 0.22334667,
- "w": 0.775654
- },
- "color": {
- "r": 0.99999994,
- "g": 0.99999994,
- "b": 0.99999994,
- "a": 1.0
- },
- "illuminance": 10000.0,
- "shadows_enabled": true
- }
- ],
- "groups": [
- {
- "name": "Model",
- "parent_group": null
- }
- ]
-}
\ No newline at end of file
diff --git a/scripts/project.test.mjs b/scripts/project.test.mjs
index 4109f96..efb7058 100644
--- a/scripts/project.test.mjs
+++ b/scripts/project.test.mjs
@@ -7,10 +7,10 @@ import { newGroup } from '../resources/js/studio/groups.js';
import { withNewId } from '../resources/js/studio/ops.js';
import { DEFAULT_ILLUMINANCE } from '../resources/js/studio/lighting.js';
-// The two projects these tests are settled against, both saved by the Studio: the older one for the
-// import path a map written before the format changed still takes, the current one for parity.
+// A document in the shape the format had before the lighting rig became one object, written here to
+// exercise the path a map saved back then still takes on the way in.
const official = JSON.parse(readFileSync(
- new URL('./fixtures/studio-0-1-project.json', import.meta.url), 'utf8',
+ new URL('./fixtures/legacy-project.json', import.meta.url), 'utf8',
));
const round = (doc) => JSON.parse(JSON.stringify(
@@ -21,7 +21,7 @@ test('a project the Studio wrote is recognised as one', () => {
assert.equal(isProject(official), true);
});
-test('a project the Studio wrote survives import and export unchanged', () => {
+test('a document in the older shape survives import and export unchanged', () => {
const read = fromProject(official);
const parts = read.parts.map(withNewId);
const groups = read.groups.map((g) => newGroup(g.name, g.slots.map((i) => parts[i]._id)));
@@ -76,8 +76,12 @@ test('a group is an index into groups, and ungrouped is null', () => {
assert.equal(out.parts[2].group, 0);
});
-test('the light default matches what the Studio writes', () => {
- assert.equal(official.lights[0].illuminance, DEFAULT_ILLUMINANCE);
+test('the rig comes from the file, not from our defaults', () => {
+ const read = fromProject(current);
+
+ assert.equal(read.lighting.sun_illuminance, 8000, 'what that file says');
+ assert.notEqual(read.lighting.sun_illuminance, DEFAULT_ILLUMINANCE, 'and not what we would pick');
+ assert.equal(read.lighting.brightness, 2000);
});
test('the slab exports as a Baseplate and keeps its faces', () => {
@@ -197,8 +201,8 @@ test('a part with no light carries no light keys', () => {
assert.equal('point_light' in fromProject({ parts: [out] }).parts[0], false);
});
-// A project the Studio saved, kept here so this is a test of the format and not of what happens to
-// be on one machine.
+// A project the Studio saved, kept here so this is a test of the format itself and not of what
+// happens to be on one machine.
const current = JSON.parse(readFileSync(
new URL('./fixtures/studio-0-2-project.json', import.meta.url), 'utf8',
));
![\"Laravel](\"https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg\"){kind=logo}