Skip to content

Commit a956476

Browse files
committed
cleanup ?
1 parent d759155 commit a956476

File tree

10 files changed

+13289
-4737
lines changed

10 files changed

+13289
-4737
lines changed

assets/glsl/screen/screen.vert

+1-4
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,4 @@ void main() {
120120
//vNoise = snoise(position * uTime * .1);
121121

122122
//vNoise = uSound3 * uTime * uSound4;
123-
}
124-
125-
126-
123+
}

classes/Animations.ts

-7
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,6 @@ export default class Animations {
151151
this.playAnimations(project, sheet, 1)
152152
}
153153

154-
createSongSequence(camera, audio_number) {
155-
const project = this.createProject('Song-sequence')
156-
const sheet = this.createSheet(project, `Song animation`)
157-
this.createTheatreObject(sheet, `Song-sequence-${audio_number}`, camera.instance, this.cameraParams)
158-
159-
160-
}
161154

162155
createTheatreObject(sheet, object_name, mesh, object_properties) {
163156

classes/Materials.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@ import screenVert from '@/assets/glsl/screen/screen.vert';
1212
import trinityFrag from '@/assets/glsl/trinity/trinity.frag';
1313
import trinityVert from '@/assets/glsl/trinity/trinity.vert';
1414

15-
16-
1715
import cubeFrag from '@/assets/glsl/cube/cube.frag';
1816
import cubeVert from '@/assets/glsl/cube/cube.vert';
1917

2018

21-
2219
export default class Materials {
2320

2421
defaultMaterial: any
@@ -174,10 +171,10 @@ export default class Materials {
174171
}
175172

176173
if(this.audio_number === 1) {
177-
this.webgl.animations.createSongSequence(this.webgl.camera, audio_number)
174+
178175
this.changeMaterial()
179176
// this.webgl.animations.cameraMoveSong(this.audio_number, this.webgl.camera.instance, target)
180-
this.webgl.animations.cam
177+
// this.webgl.animations.cam
181178
}
182179

183180
if(this.audio_number === 2) {

classes/Scene.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export default class Scene {
109109
this.instance.fog.far = camera_h * 0.6 + 24;
110110

111111
this.webgl.materials.update(elapsedTime);
112-
this.transition.update()
112+
// this.transition.update()
113113

114114
// console.log(this.camera.position.x, this.camera.position.y, this.camera.position.z)
115115
// this.controls.update();

classes/WebGL.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default class WebGL {
3535
audio_manager: any;
3636

3737

38-
constructor({ emitter }) {
38+
constructor({ emitter }: any) {
3939

4040
// ARGS
4141
this.emitter = emitter;

components/UI.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22
<div class="ui">
33

44
<button class="button-start" @click="startAudio">Start</button>
5+
<button class="fullscreen" @click="toggle"></button>
56
<!-- <AudioManager v-if="audio_started.value === true"></AudioManager> -->
67
<p class="credit">
78
@polygon1993 for Trinity video assets and scenography. <br>
8-
9-
109
</p>
1110
</div>
1211
</template>
1312
<script setup>
13+
const { toggle, isFullscreen } = useFullscreen(el)
1414
const emitter = useEmitter()
1515
const audio = useHowler()
16-
1716
const audio_started = ref(false)
1817
19-
function startAudio() {
18+
const startAudio = () => {
2019
console.log('started')
2120
audio.start()
2221
@@ -29,6 +28,7 @@ function startAudio() {
2928
}, 2000);
3029
}
3130
31+
3232
</script>
3333

3434

0 commit comments

Comments
 (0)