@@ -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 // -- -- --
0 commit comments