Skip to content

Commit c09302d

Browse files
committed
Color Correction & NDC Placement Fixes
-Still an issue with the walking path position not adopting NDC placement in camera, so the walking Rabbit Druid may still go off the screen, but fixed the placement for the Hoodoos and Inspector Position -Hoodoo's were too deep blue, made them more greenish-blue sea foam to match the foreground a little better. -Mobile Hoodoo Models added, from 11,000 polygons to ~5,500 for both on mobile, with 1k textures.
1 parent 9b60cd6 commit c09302d

8 files changed

Lines changed: 26 additions & 15 deletions

File tree

118 Bytes
Loading
1.89 KB
Loading
978 Bytes
Loading
1.23 KB
Loading
Binary file not shown.

docs/js/pxlRooms/SaltFlatsEnvironment/SaltFlatsEnvironment.js

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,22 @@ export class SaltFlatsEnvironment extends RoomEnvironment{
130130
this.ndcPositions = {
131131
'inspectorPosition': {
132132
basePosition: new Vector3( -0.662, -.6, 28 ),
133+
basePositionMobile: new Vector3( -0.662, -.6, 28 ),
134+
ndcPosition: null
135+
},
136+
'walkingPathPosition': {
137+
basePosition: new Vector3( 0, 0, 0 ),
138+
basePositionMobile: new Vector3( 0, 0, 0 ),
133139
ndcPosition: null
134140
},
135141
'leftHoodooPosition': {
136-
basePosition: new Vector3( -.83, 0.47, 165 ),
142+
basePosition: new Vector3( -.9, 0.47, 165 ),
143+
basePositionMobile: new Vector3( -.9, 0.65, 165 ),
137144
ndcPosition: null
138145
},
139146
'rightHoodooPosition': {
140-
basePosition: new Vector3( .73, 0.47, 165 ),
147+
basePosition: new Vector3( .8, 0.47, 165 ),
148+
basePositionMobile: new Vector3( .8, 0.65, 165 ),
141149
ndcPosition: null
142150
},
143151
};
@@ -237,6 +245,7 @@ export class SaltFlatsEnvironment extends RoomEnvironment{
237245
this.setCameraSpaceNDC( sw, sh );
238246
this.setInspectMarkerPos();
239247
this.checkInspectorUpdate();
248+
this.updateHoodooPositions();
240249
}, 0);
241250
}
242251

@@ -252,9 +261,16 @@ export class SaltFlatsEnvironment extends RoomEnvironment{
252261

253262
// Offsets in camera space -- ( x: -1 left to 1 right, y: -1 bottom to 1 top, z: distance from camera in units )
254263
// Tweak these while testing marker placements
255-
let leftHoodooOffset = this.ndcPositions.leftHoodooPosition.basePosition.clone();
256-
let rightHoodooOffset = this.ndcPositions.rightHoodooPosition.basePosition.clone();
257-
let inspectOffset = this.ndcPositions.inspectorPosition.basePosition.clone();
264+
let leftHoodooOffset, rightHoodooOffset, inspectOffset;
265+
if( this.mobile ){
266+
leftHoodooOffset = this.ndcPositions.leftHoodooPosition.basePositionMobile.clone();
267+
rightHoodooOffset = this.ndcPositions.rightHoodooPosition.basePositionMobile.clone();
268+
inspectOffset = this.ndcPositions.inspectorPosition.basePositionMobile.clone();
269+
}else{
270+
leftHoodooOffset = this.ndcPositions.leftHoodooPosition.basePosition.clone();
271+
rightHoodooOffset = this.ndcPositions.rightHoodooPosition.basePosition.clone();
272+
inspectOffset = this.ndcPositions.inspectorPosition.basePosition.clone();
273+
}
258274

259275
// Find Left and Right Hoodoo locations
260276
// Left Hoodoo Position
@@ -496,8 +512,8 @@ export class SaltFlatsEnvironment extends RoomEnvironment{
496512

497513
this.inspectRunTime.x = (this.pxlTimer.curMS - this.inspectBlend.y)*.5 -.2;
498514

499-
this.inspectMode = false;
500515
if( this.inspectTransition ){
516+
this.inspectMode = false;
501517
let timeOffset = this.inspectBlend.y + this.inspectDuration;
502518
if( timeOffset < this.pxlTimer.curMS){
503519
this.inspectTransition = false;
@@ -525,6 +541,8 @@ export class SaltFlatsEnvironment extends RoomEnvironment{
525541
targetPos.lerp( blendPos, inspectProgress );
526542
this.inspectController.position.copy( targetPos );
527543
}
544+
}else{
545+
this.inspectMode = this.inspectToMode;
528546
}
529547
}
530548

@@ -563,13 +581,6 @@ export class SaltFlatsEnvironment extends RoomEnvironment{
563581

564582
resize( sw, sh){
565583
this.preCalculateCameraData( sw, sh);
566-
if( this.inspectToMode && this.inspectController && this.ndcPositions.inspectorPosition.ndcPosition ){
567-
setTimeout(()=>{
568-
this.inspectController.position.copy( this.ndcPositions.inspectorPosition.ndcPosition );
569-
this.updateHoodooPositions();
570-
});
571-
}
572-
super.resize( sw, sh );
573584
}
574585

575586
// -- -- --
15.5 KB
Loading

docs/pages/projects/procstackgithubio.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ export const pageListingData = {
8585
<br><br><div class="pppHBar"></div>
8686
8787
<span class="textItch">The <span class="textItalic textShrink">'not-so'</span>&nbsp; Salt-Flats <span class="textItalic textDrinkMeAlice">(this page)</span></span> -
88-
<br>&nbsp;&nbsp; - <span class="textNudge textName">62,788</span> triangles; without Instances
89-
<br>&nbsp;&nbsp; - <span class="textNudge textName">192,588</span> triangles; with Instances
88+
<br>&nbsp;&nbsp; - <span class="textNudge textName">73,788</span> triangles; without Instances
89+
<br>&nbsp;&nbsp; - <span class="textNudge textName">203,588</span> triangles; with Instances
9090
9191
<br><br><div class="pppHBar"></div>
9292

0 commit comments

Comments
 (0)