diff -r 7de85783b823 -r 4a4f21070479 hedgewars/uVariables.pas --- a/hedgewars/uVariables.pas Sun Nov 11 16:53:16 2012 +0100 +++ b/hedgewars/uVariables.pas Sun Nov 11 17:15:19 2012 +0100 @@ -21,7 +21,7 @@ unit uVariables; interface -uses SDLh, uTypes, uFloat, GLunit, uConsts, Math, uMobile, uUtils; +uses SDLh, uTypes, uFloat, GLunit, uConsts, Math, uMobile, uUtils, uMatrix; var /////// init flags /////// @@ -76,7 +76,7 @@ CheckSum : LongWord; CampaignVariable: shortstring; - GameTicks : LongWord; + GameTicks : LongInt; {xymeng:originally LongWord} GameState : TGameState; GameType : TGameType; InputMask : LongWord; @@ -197,7 +197,7 @@ LuaGoals : shortstring; - LuaTemplateNumber : LongWord; + LuaTemplateNumber : LongInt; {org: LongWord} VoiceList : array[0..7] of TVoice = ( ( snd: sndNone; voicepack: nil), @@ -245,9 +245,11 @@ 'Graphics/Flags', // ptFlags 'Missions/Maps', // ptMissionMaps 'Graphics/SuddenDeath', // ptSuddenDeath - 'Graphics/Buttons' // ptButton + 'Graphics/Buttons', // ptButton + 'Shaders' // ptShaders ); +var Fontz: array[THWFont] of THHFont = ( (Handle: nil; Height: 12; @@ -823,7 +825,7 @@ TimeAfterTurn: Longword; minAngle, maxAngle: Longword; isDamaging: boolean; - SkipTurns: Longword; + SkipTurns: LongInt; {xymeng, org:LongWord} PosCount: Longword; PosSprite: TSprite; ejectX, ejectY: Longint; @@ -2489,6 +2491,7 @@ SyncTexture, ConfirmTexture: PTexture; cScaleFactor: GLfloat; + cStereoDepth: GLfloat; SupportNPOTT: Boolean; Step: LongInt; squaresize : LongInt; @@ -2527,6 +2530,23 @@ lastTurnChecksum : Longword; + mModelview: TMatrix4x4f; + mProjection: TMatrix4x4f; + vBuffer: GLuint; // vertex buffer + tBuffer: GLuint; // texture coords buffer + cBuffer: GLuint; // color buffer + + uCurrentMVPLocation: GLint; + + uMainMVPLocation: GLint; + uMainTintLocation: GLint; + + uWaterMVPLocation: GLint; + + aVertex: GLint; + aTexCoord: GLint; + aColor: GLint; + var trammo: array[TAmmoStrId] of ansistring; // name of the weapon trammoc: array[TAmmoStrId] of ansistring; // caption of the weapon trammod: array[TAmmoStrId] of ansistring; // description of the weapon @@ -2728,13 +2748,10 @@ vobSDVelocity:= 15; vobSDFallSpeed:= 250; -{$IFNDEF PAS2C} - //TODO: FIXME!! cMinScreenWidth:= min(cScreenWidth, 640); cMinScreenHeight:= min(cScreenHeight, 480); cOrigScreenWidth:= cScreenWidth; cOrigScreenHeight:= cScreenHeight; -{$ENDIF} cNewScreenWidth := cScreenWidth; cNewScreenHeight := cScreenHeight; @@ -2744,6 +2761,13 @@ cMapName:= ''; LuaTemplateNumber:= 0; + cStereoDepth := 0; + + MatrixLoadIdentity(mModelview); + MatrixLoadIdentity(mProjection); + aVertex:= 0; + aTexCoord:= 1; + aColor:= 2; end; procedure freeModule;