adrien/teTra
adrien/teTra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

another leak fixed!

Browse Source
This commit is contained in:
Adrien MALINGREY 2024-09-27 00:47:23 +02:00
parent 825fbca97b
commit c8eb029987
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app.js
View File

@ -323,10 +323,11 @@ function animate() {
playfield.update(delta) playfield.update(delta)
Mino.meshes.update() Mino.meshes.update()
controls.update() controls.update()
gui.update()
renderer.render(scene, scene.camera) renderer.render(scene, scene.camera)
environment.camera.update(renderer, scene) environment.camera.update(renderer, scene)
gui.update()
} }
window.addEventListener("resize", () => { window.addEventListener("resize", () => {

16
jsm/Tetrominoes.js
View File

@ -253,7 +253,7 @@ class Tetromino extends THREE.Group {
canMove(translation, facing=this.facing) { canMove(translation, facing=this.facing) {
let testPosition = this.position.clone().add(translation) let testPosition = this.position.clone().add(translation)
return this.minoesPosition[facing].every(minoPosition => this.parent.cellIsEmpty(minoPosition.clone().add(testPosition))) return this.minoesPosition[facing].every(minoPosition => this.parent?.cellIsEmpty(minoPosition.clone().add(testPosition)))
} }
move(translation, rotatedFacing, rotationPoint) { move(translation, rotatedFacing, rotationPoint) {
@ -266,12 +266,12 @@ class Tetromino extends THREE.Group {
} }
if (this.canMove(TRANSLATION.DOWN)) { if (this.canMove(TRANSLATION.DOWN)) {
this.locking = false this.locking = false
this.parent.ghost.copy(this) this.parent?.ghost.copy(this)
scheduler.clearTimeout(this.onLockDown) scheduler.clearTimeout(this.onLockDown)
} else { } else {
scheduler.resetTimeout(this.onLockDown, this.lockDelay) scheduler.resetTimeout(this.onLockDown, this.lockDelay)
this.locking = true this.locking = true
this.parent.ghost.visible = false this.parent?.ghost.visible = false
} }
return true return true
} else if (translation == TRANSLATION.DOWN) { } else if (translation == TRANSLATION.DOWN) {
@ -479,7 +479,6 @@ class Playfield extends THREE.Group {
}), }),
[retroEdgeMaterial, sideMaterial, sideMaterial, sideMaterial, sideMaterial, sideMaterial], [retroEdgeMaterial, sideMaterial, sideMaterial, sideMaterial, sideMaterial, sideMaterial],
) )
this.add(this.retroEdge)
const back = new THREE.Mesh( const back = new THREE.Mesh(
new THREE.PlaneGeometry(COLUMNS, SKYLINE), new THREE.PlaneGeometry(COLUMNS, SKYLINE),
new THREE.MeshStandardMaterial({ new THREE.MeshStandardMaterial({
@ -491,6 +490,7 @@ class Playfield extends THREE.Group {
back.position.set(COLUMNS/2, SKYLINE/2, 0) back.position.set(COLUMNS/2, SKYLINE/2, 0)
this.retroEdge.add(back) this.retroEdge.add(back)
this.retroEdge.visible = false this.retroEdge.visible = false
this.add(this.retroEdge)
const positionKF = new THREE.VectorKeyframeTrack('.position', [0, 1, 2], [0, 0, 0, 0, -0.2, 0, 0, 0, 0]) const positionKF = new THREE.VectorKeyframeTrack('.position', [0, 1, 2], [0, 0, 0, 0, -0.2, 0, 0, 0, 0])
const clip = new THREE.AnimationClip('HardDrop', 3, [positionKF]) const clip = new THREE.AnimationClip('HardDrop', 3, [positionKF])
@ -524,6 +524,7 @@ class Playfield extends THREE.Group {
set piece(piece) { set piece(piece) {
if (piece) { if (piece) {
this.remove(this.piece)
this.add(piece) this.add(piece)
piece.position.set(4, SKYLINE) piece.position.set(4, SKYLINE)
this.ghost.copy(piece) this.ghost.copy(piece)
@ -569,7 +570,10 @@ class Playfield extends THREE.Group {
updateFreedMinoes(delta) { updateFreedMinoes(delta) {
this.freedMinoes.forEach(mino => { this.freedMinoes.forEach(mino => {
if (mino.explode(delta)) this.freedMinoes.delete(mino) if (mino.explode(delta)) {
this.remove(mino)
this.freedMinoes.delete(mino)
}
}) })
} }
@ -588,6 +592,7 @@ class HoldQueue extends THREE.Group {
set piece(piece) { set piece(piece) {
if(piece) { if(piece) {
this.remove(this.piece)
piece.holdEnabled = false piece.holdEnabled = false
piece.locking = false piece.locking = false
piece.position.set(0, 0) piece.position.set(0, 0)
@ -616,6 +621,7 @@ class NextQueue extends THREE.Group {
shift() { shift() {
let fistPiece = this.children.shift() let fistPiece = this.children.shift()
this.remove(fistPiece)
this.add(new Tetromino.random()) this.add(new Tetromino.random())
this.positions.forEach((position, i) => this.children[i].position.copy(position)) this.positions.forEach((position, i) => this.children[i].position.copy(position))
return fistPiece return fistPiece

2
jsm/Vortex.js
View File

@ -81,7 +81,7 @@ export class Vortex extends THREE.Group {
texture.repeat.set(2, 2) texture.repeat.set(2, 2)
this.colorFullCylinder.material.map = texture this.colorFullCylinder.material.map = texture
}) })
this.colorFullCylinder.material.opacity = 0.34 this.colorFullCylinder.material.opacity = 0.14
this.globalRotation = 0.028 this.globalRotation = 0.028
this.darkTextureRotation = 0.006 this.darkTextureRotation = 0.006