summaryrefslogtreecommitdiff
path: root/frontend/site
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2021-04-13 16:40:48 +0200
committerJules Laplace <julescarbon@gmail.com>2021-04-13 16:40:48 +0200
commit3365eccdaf2c0b6d49ecac33b584ec32bd8652a6 (patch)
tree1d7587268db92a2f9631c30e6a6e42395d4e66cf /frontend/site
parentc4afa5d3bedff9bbe1b0b848d3b9f89fe8874632 (diff)
stl more shiny
Diffstat (limited to 'frontend/site')
-rw-r--r--frontend/site/projects/museum/constants.js2
-rw-r--r--frontend/site/projects/museum/stl-files.js17
-rw-r--r--frontend/site/projects/museum/stl/STLViewer.js2
3 files changed, 13 insertions, 8 deletions
diff --git a/frontend/site/projects/museum/constants.js b/frontend/site/projects/museum/constants.js
index 4913717..5c3288d 100644
--- a/frontend/site/projects/museum/constants.js
+++ b/frontend/site/projects/museum/constants.js
@@ -1,7 +1,7 @@
export const ARTISTS = {
nora: {
name: "Nora Al-Badri",
- location: "C-Base, Berlin, Germany",
+ location: "CCCB and c-base, Berlin, Germany",
start: "nora-1",
bio: `
<p>
diff --git a/frontend/site/projects/museum/stl-files.js b/frontend/site/projects/museum/stl-files.js
index a6fc957..146e135 100644
--- a/frontend/site/projects/museum/stl-files.js
+++ b/frontend/site/projects/museum/stl-files.js
@@ -3,8 +3,9 @@ export const STL_FILES = {
"nora-nefertiti": {
url: "/last-museum/static/media/last-museum/nora-albadri/nefertiti.stl",
modelMaterial: {
- color: "#0000ff",
- shininess: 30,
+ color: "#bbbbff",
+ metalness: 0.8,
+ roughness: 0.4,
},
width: () => window.innerWidth / 2,
height: () => window.innerHeight * 2/3,
@@ -25,7 +26,8 @@ export const STL_FILES = {
url: "/last-museum/static/media/last-museum/nora-albadri/shehorus.stl",
modelMaterial: {
color: "#888888",
- shininess: 100,
+ metalness: 0.8,
+ roughness: 0.4,
},
width: () => window.innerWidth * 0.25,
height: () => window.innerHeight * 2/3,
@@ -46,7 +48,8 @@ export const STL_FILES = {
url: "/last-museum/static/media/last-museum/nora-albadri/peg.stl",
modelMaterial: {
color: "#0000ff",
- shininess: 30,
+ metalness: 0.8,
+ roughness: 0.4,
},
width: () => window.innerWidth / 2,
height: () => window.innerHeight * 2/3,
@@ -68,7 +71,8 @@ export const STL_FILES = {
url: "/last-museum/static/media/last-museum/nora-albadri/lamassu.stl",
modelMaterial: {
color: "#bfb8a8",
- shininess: 60,
+ metalness: 0.8,
+ roughness: 0.4,
},
width: () => window.innerWidth * 1/2,
height: () => window.innerHeight * 2/3,
@@ -90,7 +94,8 @@ export const STL_FILES = {
url: "/last-museum/static/media/last-museum/nora-albadri/queen.stl",
modelMaterial: {
color: "#BCC6CC",
- shininess: 80,
+ metalness: 0.8,
+ roughness: 0.4,
},
width: () => window.innerWidth / 2,
height: () => window.innerHeight * 2/3,
diff --git a/frontend/site/projects/museum/stl/STLViewer.js b/frontend/site/projects/museum/stl/STLViewer.js
index 39848ad..b781f63 100644
--- a/frontend/site/projects/museum/stl/STLViewer.js
+++ b/frontend/site/projects/museum/stl/STLViewer.js
@@ -89,7 +89,7 @@ class STLViewer extends Component {
mesh = new THREE.Mesh(
geometry,
- new THREE.MeshPhongMaterial(modelMaterial)
+ new THREE.MeshStandardMaterial(modelMaterial)
);
geometry.computeBoundingBox();