Skip to content

Commit 8eb8615

Browse files
author
isokron
committed
Fixes perlin noise for shields never being turned on
Sets a default height for fpscamera git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@1439 37977431-3df6-0310-b722-df95706aa16b
1 parent ea485c7 commit 8eb8615

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

rts/Game/CameraController.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ CCameraController::~CCameraController(void)
3333
/////////////////////
3434

3535
CFPSController::CFPSController()
36-
: pos(2000,70,1800)
36+
: pos(2000,70,1800),
37+
oldHeight(300)
3738
{
3839
scrollSpeed=configHandler.GetInt("FPSScrollSpeed",10)*0.1;
3940
enabled=!!configHandler.GetInt("FPSEnabled",1);
@@ -479,7 +480,7 @@ float3 COverviewController::GetPos()
479480

480481
float3 COverviewController::GetDir()
481482
{
482-
return float3(0,-1,-0.0001).Normalize();
483+
return float3(0,-1,-0.001).Normalize();
483484
}
484485

485486
void COverviewController::SetPos(float3 newPos)

rts/Sim/Projectiles/ProjectileHandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ CProjectileHandler::CProjectileHandler()
387387
if(shadowHandler && shadowHandler->drawShadows){
388388
perlinFB = instantiate_fb(128);
389389
if (perlinFB && perlinFB->valid()){
390-
drawPerlinTex=false;
390+
drawPerlinTex=true;
391391
perlinFB->attachTexture(CProjectile::textures[0], GL_TEXTURE_2D, FBO_ATTACH_COLOR);
392392
perlinFB->checkFBOStatus();
393393
}

0 commit comments

Comments
 (0)