Skip to content

Commit 5605ab1

Browse files
committed
update
1 parent 2acea00 commit 5605ab1

File tree

4 files changed

+35
-13
lines changed

4 files changed

+35
-13
lines changed

js/app.js

+21-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ let fallingbricks = new Queue();
2525
let fallingbrick = new FallingBrick();
2626
let scale = new THREE.Vector3();
2727
let position = new THREE.Vector3();
28-
let command = PLAY, startPos = 6.5, direction = 'x';
28+
let command = PLAY, startPos = 6.5, direction = 'z';
2929
let hue = 0;
3030
let scoreValue = 0;
3131
var scoreDisplay = document.getElementById("score");
@@ -196,6 +196,26 @@ function loop() {
196196
// var fallingbrick = new FallingBrick(prevBrick.params);
197197
// fallingbricks.push(fallingbrick);
198198
// scene.add(fallingbrick.build);
199+
if(brick.params.direction == 'x') {
200+
var a_fallingbrick = new FallingBrick({
201+
position: new THREE.Vector3(cutted_brick[3].x + brick.scale.x, -1, cutted_brick[3].z),
202+
scale: new THREE.Vector3(cutted_brick[2].x, 1, brick.scale.z),
203+
direction: 'z',
204+
color: "hsl(" + hue +", 100%, 50%)"
205+
});
206+
// fallingbricks.push(fallingbrick);
207+
scene.add(a_fallingbrick.build);
208+
}
209+
else if(brick.params.direction == 'z') {
210+
var a_fallingbrick = new FallingBrick({
211+
position: new THREE.Vector3(cutted_brick[3].x, -1, cutted_brick[3].z + brick.scale.z),
212+
scale: new THREE.Vector3(brick.scale.x, 1, cutted_brick[2].z),
213+
direction: 'z',
214+
color: "hsl(" + hue +", 100%, 50%)"
215+
});
216+
// fallingbricks.push(fallingbrick);
217+
scene.add(a_fallingbrick.build);
218+
}
199219

200220
bricks.set(brick);
201221

js/brick.js

+11-10
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ class Brick {
7575
}
7676

7777
get color() {
78-
// return this.material.color.getHSL();
79-
return this.physijs_material.color.getHSL();
78+
var HSLColor = new THREE.Color;
79+
this.physijs_material.color.getHSL(HSLColor);
80+
return HSLColor;
8081
}
8182

8283
/**
@@ -137,30 +138,26 @@ class Brick {
137138
*/
138139
cut(prevBrick)
139140
{
140-
console.log(this.color);
141141
var mantap = false;
142142
var prevPosition = prevBrick.position;
143143
prevPosition.x = Number((prevPosition.x).toFixed(1));
144-
prevPosition.y = Number((prevPosition.y).toFixed(1));
145144
prevPosition.z = Number((prevPosition.z).toFixed(1));
146145

147146
var curScale = this.scale;
148147
curScale.x = Number((curScale.x).toFixed(1));
149-
curScale.y = Number((curScale.y).toFixed(1));
150148
curScale.z = Number((curScale.z).toFixed(1));
151149

152150
var curPosition = this.position;
153151
curPosition.x = Number((curPosition.x).toFixed(1));
154-
curPosition.y = Number((curPosition.y).toFixed(1));
155152
curPosition.z = Number((curPosition.z).toFixed(1));
156153

157154
var diffX = curPosition.x - prevPosition.x;
158155
var diffZ = curPosition.z - prevPosition.z;
159156

160-
// console.log("x : " + diffX, curScale.x);
161-
// console.log("Z : " + diffZ, curScale.z);
157+
console.log("x : " + diffX, curScale.x);
158+
console.log("Z : " + diffZ, curScale.z);
162159

163-
if(diffX==0 && diffZ==0){
160+
if(diffX == 0 && diffZ == 0){
164161
perfect.style.opacity = 1.0;
165162
mantap = true;
166163
}
@@ -181,7 +178,11 @@ class Brick {
181178

182179
Brick.increaseSpeed();
183180
this.scale.copy(curScale);
184-
return [true, prevPosition, curScale, curPosition, this.color, mantap];
181+
var ukuran = new THREE.Vector3();
182+
var scalebaru = new THREE.Vector3();
183+
ukuran.set(diffX, 1, diffZ);
184+
console.log(ukuran);
185+
return [true, prevPosition, ukuran, curPosition, this.color, mantap];
185186
}
186187

187188
/**

js/fallingbrick.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class FallingBrick {
9898
* @param {THREE.Vector3} newScale
9999
*/
100100
set scale(newScale) {
101-
this.scale.copy(newScale);
101+
this.scale.set(newScale.x, netScale.y, newScale.z);
102102
}
103103

104104
down() {

js/master.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ socket.on('sync', function(data) {
7878
for(let i = 0;i < data.property.length; i++) {
7979
bricks.items[i].position = data.property[i].position;
8080
bricks.items[i].scale = data.property[i].scale;
81-
bricks.items[i].color = data.property[i].color;
81+
bricks.items[i].color = (data.property[i].hue, 1., .5);
82+
console.log(data.property[i].hue);
8283
}
8384

8485
if(data.score != previousScoreValue) {

0 commit comments

Comments
 (0)