Skip to content

Commit f6cc61b

Browse files
committed
Re-added the spring bounce
switched from max-width to width to get the animation back Invert Mouse Inspect Controls I had it flipped, right was spinning left, and visa versa
1 parent 1ba11e7 commit f6cc61b

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

docs/js/pxlRooms/SaltFlatsEnvironment/SaltFlatsEnvironment.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,9 @@ export class SaltFlatsEnvironment extends RoomEnvironment{
227227

228228
let timeOffset = 0;
229229
if( this.touchMouseData.active ){
230-
//console.log(this.touchMouseData.curDistance)
231230
timeOffset = this.pxlTimer.curMS - this.touchMouseData.startTime;
232231
}
233232

234-
//this.inspectController.rotation.y = this.touchMouseData.startRot + this.touchMouseData.curDistance.x*.02 ;
235233
this.inspectController.rotation.y = this.inspectController.rotation.y % this.tau;
236234
this.inspectBlendStartTime += timeOffset;
237235
this.inspectStartTime = this.pxlTimer.curMS - this.inspectController.rotation.y;
@@ -324,7 +322,7 @@ export class SaltFlatsEnvironment extends RoomEnvironment{
324322
targetInspectPos.y = 14;
325323

326324
let screenRatio = this.pxlDevice.sW / this.pxlDevice.sH;
327-
targetInspectPos.z = 2.0 + 3.00 * (screenRatio*screenRatio);
325+
targetInspectPos.z = 2.1 + 3.00 * (screenRatio*screenRatio);
328326

329327

330328
this.inspectMarkerPos.copy( targetInspectPos );
@@ -389,10 +387,10 @@ export class SaltFlatsEnvironment extends RoomEnvironment{
389387

390388
if( this.touchMouseData.active ){
391389
//this.inspectController.rotation.y -= this.touchMouseData.velocity.x*.1 ;
392-
this.inspectController.rotation.y = this.touchMouseData.startRot + this.touchMouseData.curDistance.x*.02 ;
390+
this.inspectController.rotation.y = this.touchMouseData.startRot - this.touchMouseData.curDistance.x*.02 ;
393391
}else if( this.inspectToMode ){
394392
this.touchMouseData.curDistance.x *= 0.92;
395-
let offsetDist = this.touchMouseData.curDistance.x * 0.02;
393+
let offsetDist = -this.touchMouseData.curDistance.x * 0.02;
396394

397395

398396
let inspectProgress = (this.pxlTimer.curMS - this.inspectBlendStartTime) * .5 - .1;

docs/style/procPages/procPages_pageLayout.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
overflow: hidden;
2525
padding: 0px 0px 10px 0px;
2626
width: 100%;
27+
transition: max-width 0.3s ease, width 0.3s ease;
2728
}
2829

2930
/* -- -- -- */

docs/style/procPages/procPages_projectsStyle.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,5 +275,5 @@
275275
}
276276

277277
.projectsPage_thisProjectContentStyle {
278-
max-width: min(70vw, 1600px);
278+
width: min(70vw, 1600px);
279279
}

0 commit comments

Comments
 (0)