adjusting three stuff

3 files changed, 33 insertions, 29 deletions

diff --git a/frontend/site/projects/museum/constants.js b/frontend/site/projects/museum/constants.js
index 9c76234..501b7f1 100644
--- a/frontend/site/projects/museum/constants.js
+++ b/frontend/site/projects/museum/constants.js
@@ -78,7 +78,7 @@ export const ARTISTS = {
 }
 
 export const ARTIST_ORDER = [
-  "nora", "foreshew", "leite", "opoku", "nilthamrong", "stankievech",
+  "stankievech", "nora", "leite", "opoku", "foreshew", "nilthamrong",
 ]
 
 export const PROJECT_PAGE_SET = new Set(["essay", "artists", "credits"])
diff --git a/frontend/site/projects/museum/stl-files.js b/frontend/site/projects/museum/stl-files.js
index a7a0242..6ac3b75 100644
--- a/frontend/site/projects/museum/stl-files.js
+++ b/frontend/site/projects/museum/stl-files.js
@@ -1,12 +1,13 @@
 export const STL_FILES = {
-  "nora-queen-of-night-server": {
-    url: "/last-museum/static/media/last-museum/nora-albadri/queen.stl",
+
+  "nora-nefertiti": {
+    url: "/last-museum/static/media/last-museum/nora-albadri/nefertiti.stl",
     modelMaterial: { 
-      color: "#BCC6CC", 
-      shininess: 50,
+      color: "#0000ff", 
+      shininess: 30,
     },
     width: () => window.innerWidth / 2,
-    height: () => window.innerHeight,
+    height: () => window.innerHeight * 2/3,
     style: {
       left: "0",
       top: "0",
@@ -20,17 +21,18 @@ export const STL_FILES = {
     }
   },
 
-  "nora-lamassu-space": {
-    url: "/last-museum/static/media/last-museum/nora-albadri/lamassu.stl",
+  "nora-horus-2": {
+    url: "/last-museum/static/media/last-museum/nora-albadri/shehorus.stl",
     modelMaterial: { 
-      color: "#bfb8a8", 
-      shininess: 60,
+      color: "#888888", 
+      shininess: 100,
     },
     width: () => window.innerWidth / 2,
     height: () => window.innerHeight,
     style: {
       right: "0",
-      top: "0",
+      top: "50%",
+      transform: "translateY(-50%)",
     },
     transform: {
       rotate: {
@@ -61,16 +63,17 @@ export const STL_FILES = {
       }
     }
   },
-  "nora-nefertiti": {
-    url: "/last-museum/static/media/last-museum/nora-albadri/nefertiti.stl",
+
+  "nora-lamassu-space": {
+    url: "/last-museum/static/media/last-museum/nora-albadri/lamassu.stl",
     modelMaterial: { 
-      color: "#0000ff", 
-      shininess: 30,
+      color: "#bfb8a8", 
+      shininess: 60,
     },
     width: () => window.innerWidth / 2,
-    height: () => window.innerHeight * 2/3,
+    height: () => window.innerHeight,
     style: {
-      left: "0",
+      right: "0",
       top: "0",
     },
     transform: {
@@ -81,18 +84,18 @@ export const STL_FILES = {
       }
     }
   },
-  "nora-horus-2": {
-    url: "/last-museum/static/media/last-museum/nora-albadri/shehorus.stl",
+
+  "nora-queen-of-night-server": {
+    url: "/last-museum/static/media/last-museum/nora-albadri/queen.stl",
     modelMaterial: { 
-      color: "#888888", 
-      shininess: 100,
+      color: "#BCC6CC", 
+      shininess: 80,
     },
     width: () => window.innerWidth / 2,
     height: () => window.innerHeight,
     style: {
-      right: "0",
-      top: "50%",
-      transform: "translateY(-50%)",
+      left: "0",
+      top: "0",
     },
     transform: {
       rotate: {
@@ -101,5 +104,6 @@ export const STL_FILES = {
         z: 0,
       }
     }
-  }
+  },
+
 }
diff --git a/frontend/site/projects/museum/stl/STLViewer.js b/frontend/site/projects/museum/stl/STLViewer.js
index a4bbad1..39848ad 100644
--- a/frontend/site/projects/museum/stl/STLViewer.js
+++ b/frontend/site/projects/museum/stl/STLViewer.js
@@ -68,14 +68,14 @@ class STLViewer extends Component {
     const directionalLight = new THREE.DirectionalLight(0xddeeff, 0.6);
     directionalLight.position.x = 100;
     directionalLight.position.y = 100;
-    directionalLight.position.z = 300;
+    directionalLight.position.z = 200;
     directionalLight.position.normalize();
     scene.add(directionalLight);
 
     const directionalLight2 = new THREE.DirectionalLight(0xffffdd, 0.6);
-    directionalLight2.position.x = -100;
-    directionalLight2.position.y = 100;
-    directionalLight2.position.z = -300;
+    directionalLight2.position.x = -75;
+    directionalLight2.position.y = 75;
+    directionalLight2.position.z = -200;
     directionalLight2.position.normalize();
     scene.add(directionalLight2);