Skip to content

Commit 196960a

Browse files
committed
Improve stickers + keyring tab, change 3d model outline colour
1 parent b3d5b1e commit 196960a

File tree

7 files changed

+50
-219
lines changed

7 files changed

+50
-219
lines changed

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SLACK_TEAM=T0266FRGM
2121

2222
SUPER_ADMIN_SLACK_ID=changeme
2323

24-
IDV_DOMAIN=account.hackclub.com
24+
IDV_DOMAIN=auth.hackclub.com
2525
IDV_CLIENT_ID=changeme
2626
IDV_CLIENT_SECRET=changeme
2727

src/lib/assets/keyring.3mf

48.8 KB
Binary file not shown.

src/lib/components/Devlog.svelte

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@
5757
controls.update();
5858
5959
// Lighting
60-
const hemisphere = new THREE.HemisphereLight(0xffffff, 0xffffff, 1.1);
60+
const hemisphere = new THREE.HemisphereLight(0xffffff, 0xffffff, 1.6);
6161
scene.add(hemisphere);
6262
63-
const directional = new THREE.DirectionalLight(0xffffff, 1.1);
63+
const directional = new THREE.DirectionalLight(0xffffff, 2);
6464
directional.castShadow = true;
6565
directional.shadow.mapSize.width = 2048;
6666
directional.shadow.mapSize.height = 2048;
6767
scene.add(directional);
6868
69-
const directional2 = new THREE.DirectionalLight(0xffffff, 1.1);
69+
const directional2 = new THREE.DirectionalLight(0xffffff, 2);
7070
directional2.castShadow = true;
7171
directional2.shadow.mapSize.width = 2048;
7272
directional2.shadow.mapSize.height = 2048;
@@ -88,7 +88,7 @@
8888
var meshMaterial = new THREE.MeshStandardMaterial({
8989
transparent: true,
9090
opacity: 0.9,
91-
color: 0xb2a090,
91+
color: 0xc2b0a0,
9292
roughness: 0.5,
9393
flatShading: false,
9494
side: THREE.DoubleSide
@@ -135,7 +135,7 @@
135135
const lines = new THREE.LineSegments(
136136
edges,
137137
new THREE.LineBasicMaterial({
138-
color: 0xf3dcc6,
138+
color: 0x94857d,
139139
linewidth: 1,
140140
polygonOffset: true,
141141
polygonOffsetFactor: -1,
@@ -227,7 +227,7 @@
227227
const lines = new THREE.LineSegments(
228228
edges,
229229
new THREE.LineBasicMaterial({
230-
color: 0xf3dcc6,
230+
color: 0x94857d,
231231
linewidth: 1,
232232
polygonOffset: true,
233233
polygonOffsetFactor: -1,

src/lib/components/ThreeMFPreview.svelte

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { ThreeMFLoader, OrbitControls } from 'three/examples/jsm/Addons.js';
44
import { onMount } from 'svelte';
55
6-
let { identifier, modelUrl } = $props();
6+
let { identifier, modelUrl, lineColor = 0x94857d } = $props();
77
88
// Necessary for camera/plane rotation
99
let degree = Math.PI / 180;
@@ -51,16 +51,16 @@
5151
controls.update();
5252
5353
// Lighting
54-
const hemisphere = new THREE.HemisphereLight(0xffffff, 0xffffff, 1.1);
54+
const hemisphere = new THREE.HemisphereLight(0xffffff, 0xffffff, 1.6);
5555
scene.add(hemisphere);
5656
57-
const directional = new THREE.DirectionalLight(0xffffff, 1.1);
57+
const directional = new THREE.DirectionalLight(0xffffff, 2);
5858
directional.castShadow = true;
5959
directional.shadow.mapSize.width = 2048;
6060
directional.shadow.mapSize.height = 2048;
6161
scene.add(directional);
6262
63-
const directional2 = new THREE.DirectionalLight(0xffffff, 1.1);
63+
const directional2 = new THREE.DirectionalLight(0xffffff, 2);
6464
directional2.castShadow = true;
6565
directional2.shadow.mapSize.width = 2048;
6666
directional2.shadow.mapSize.height = 2048;
@@ -79,15 +79,6 @@
7979
}
8080
}
8181
82-
var meshMaterial = new THREE.MeshStandardMaterial({
83-
transparent: true,
84-
opacity: 0.9,
85-
color: 0xb2a090,
86-
roughness: 0.5,
87-
flatShading: false,
88-
side: THREE.DoubleSide
89-
});
90-
9182
function parseObject(object: THREE.Group<THREE.Object3DEventMap>) {
9283
object = object as THREE.Group<THREE.Object3DEventMap> & { children: THREE.Mesh[] };
9384
@@ -145,7 +136,7 @@
145136
const lines = new THREE.LineSegments(
146137
edges,
147138
new THREE.LineBasicMaterial({
148-
color: 0xf3dcc6,
139+
color: lineColor,
149140
linewidth: 1,
150141
polygonOffset: true,
151142
polygonOffsetFactor: -1,

0 commit comments

Comments
 (0)