Skip to content

Commit 32b8a53

Browse files
committed
OutletEnvironment scene mods
_Ground Data painted __Cleaned up areas under pine trees due to acids __Added more grass _Fixed the fog exponential
1 parent 400ee62 commit 32b8a53

File tree

8 files changed

+18
-12
lines changed

8 files changed

+18
-12
lines changed

docs/js/pxlNav.esm.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/js/pxlRooms/CampfireEnvironment/CampfireEnvironment.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,9 @@ export class CampfireEnvironment extends RoomEnvironment{
280280
//emberSettings["wanderInf"] = wanderInfluence;
281281
//emberSettings["wanderFrequency"] = wanderFrequency;
282282

283-
emberSettings["EmberSpread"] = 9.0;
283+
emberSettings["EmberSpread"] = 8.0;
284284
emberSettings["EmberFadeDistance"] = 0.052;
285-
emberSettings["ShiftFromZero"] = 0.65;
285+
emberSettings["ShiftFromZero"] = 0.7;
286286
emberSettings["MultPosXZ"] = 0.650;
287287

288288
//
@@ -291,9 +291,8 @@ export class CampfireEnvironment extends RoomEnvironment{
291291

292292
eWisps.build( emberSettings );
293293

294-
eWisps.points.renderOrder = 6;
295-
296294
eWisps.points.renderOrder = 2;
295+
297296
}
298297

299298

@@ -441,6 +440,11 @@ export class CampfireEnvironment extends RoomEnvironment{
441440
campfireObj.renderOrder = campefireOrder;
442441
}
443442

443+
444+
// Set moon plane texture settings
445+
// Removed from the FBX for now, but leaving in the texture check
446+
// I'm sure I'll be confuzed why the same texture issues exist,
447+
// Then add this back in to fix it.
444448
let moonObj = this.geoList['Scripted']['Moon_geo'];
445449
if( moonObj ){
446450
moonObj.material.map.wrapS = ClampToEdgeWrapping;
75.2 KB
Loading
-2.81 KB
Loading
-596 Bytes
Loading
84.3 KB
Binary file not shown.

docs/js/pxlRooms/OutletEnvironment/OutletEnvironment.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export class OutletEnvironment extends RoomEnvironment{
8080

8181
// Room Fog Settings
8282
this.fogColor=new Color( 0x48415d );
83-
this.fogExp=.0007;
83+
this.fogExp=.00035;
8484
this.fog=new FogExp2( this.fogColor, this.fogExp);
8585

8686
}
@@ -355,7 +355,9 @@ builBugs(){
355355

356356
let grassCardSettings = {
357357
'buildAlpha' : true,
358-
'addShimmer' : true
358+
'addShimmer' : true,
359+
'depthScalar' : .0001,
360+
'dewarpFactor' : .35,
359361
}
360362

361363
let grassCardsMat=this.pxlFile.pxlShaderBuilder( grassCardsAUniforms, instPlantsVert(), instPlantsFrag( grassCardSettings ) );
@@ -386,11 +388,11 @@ builBugs(){
386388
grassClusterUniforms.noiseTexture.value = this.pxlUtils.loadTexture( this.assetPath+"Noise_UniformWebbing.jpg" );
387389

388390
let instPlantSettings = {
389-
'depthScalar' : .0001,
391+
'depthScalar' : .00013,
390392
'dewarpFactor' : .35,
391393
}
392394

393-
let grassMat=this.pxlFile.pxlShaderBuilder( grassClusterUniforms, instPlantsVert(), instPlantsFrag() );
395+
let grassMat=this.pxlFile.pxlShaderBuilder( grassClusterUniforms, instPlantsVert(), instPlantsFrag(instPlantSettings) );
394396
grassMat.side = DoubleSide;
395397
grassMat.lights = true;
396398
grassMat.transparent = false;

docs/js/pxlRooms/OutletEnvironment/Shaders/instPlants.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,9 @@ export function instPlantsFrag( settings={} ){
349349
ret+=`
350350
351351
352-
float fogMix = clamp( depth * (depth*4.501+1.5) - lightMag*(1.0-depth * FogDepthMult), 0.0, 1.0 ) ;
353-
354-
vec3 toFogColor = fogColor * (gCd*.4 + .7 + gInf*.3);
352+
float fogMix = clamp( depth * (depth*2.0+1.5) - lightMag*(1.0-depth * FogDepthMult), 0.0, 1.0 ) ;
353+
354+
vec3 toFogColor = fogColor * (gCd*.50 + .75 + gInf*.2);
355355
Cd.rgb= mix( Cd.rgb, toFogColor, fogMix );
356356
357357
// -- -- --

0 commit comments

Comments
 (0)