[prev in list] [next in list] [prev in thread] [next in thread]
List: bzflag-commits
Subject: SF.net SVN: bzflag:[19561] trunk/bzflag/src
From: trepan () users ! sourceforge ! net
Date: 2009-03-31 20:00:43
Message-ID: E1Lok8Z-00077B-1C () dn4whf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 19561
http://bzflag.svn.sourceforge.net/bzflag/?rev=19561&view=rev
Author: trepan
Date: 2009-03-31 20:00:35 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
* OpenGL v1.2 is the new minimum version required (run-time checked)
Modified Paths:
--------------
trunk/bzflag/src/bzflag/BackgroundRenderer.cxx
trunk/bzflag/src/bzflag/CommandsStandard.cxx
trunk/bzflag/src/bzflag/EventHandler.cxx
trunk/bzflag/src/bzflag/Player.cxx
trunk/bzflag/src/bzflag/RadarRenderer.cxx
trunk/bzflag/src/bzflag/bzflag.cxx
trunk/bzflag/src/bzfs/BZWReader.cxx
trunk/bzflag/src/bzfs/ListServerConnection.cxx
trunk/bzflag/src/bzfs/WorldEventManager.cxx
trunk/bzflag/src/common/ParseColor.cxx
trunk/bzflag/src/geometry/SphereSceneNode.cxx
trunk/bzflag/src/lua/LuaTextures.cxx
Modified: trunk/bzflag/src/bzflag/BackgroundRenderer.cxx
===================================================================
--- trunk/bzflag/src/bzflag/BackgroundRenderer.cxx 2009-03-31 18:33:15 UTC (rev \
19560)
+++ trunk/bzflag/src/bzflag/BackgroundRenderer.cxx 2009-03-31 20:00:35 UTC (rev \
19561) @@ -1028,10 +1028,7 @@
}
// setup the wrap mode
- skyboxWrapMode = GL_CLAMP;
- if (GLEW_VERSION_1_2) {
- skyboxWrapMode = GL_CLAMP_TO_EDGE;
- }
+ skyboxWrapMode = GL_CLAMP_TO_EDGE;
// setup the corner colors
const int cornerFaces[8][3] = {
Modified: trunk/bzflag/src/bzflag/CommandsStandard.cxx
===================================================================
--- trunk/bzflag/src/bzflag/CommandsStandard.cxx 2009-03-31 18:33:15 UTC (rev 19560)
+++ trunk/bzflag/src/bzflag/CommandsStandard.cxx 2009-03-31 20:00:35 UTC (rev 19561)
@@ -358,7 +358,7 @@
index = 0; // start at the first value when there are no matches
}
index = (index % (args.size() - 1)) + 1;
-
+
BZDB.set(key, args[index]);
return string();
Modified: trunk/bzflag/src/bzflag/EventHandler.cxx
===================================================================
--- trunk/bzflag/src/bzflag/EventHandler.cxx 2009-03-31 18:33:15 UTC (rev 19560)
+++ trunk/bzflag/src/bzflag/EventHandler.cxx 2009-03-31 20:00:35 UTC (rev 19561)
@@ -72,71 +72,71 @@
const int GameStateOrder = EventClient::GameStateOrder;
const int DrawWorldOrder = EventClient::DrawWorldOrder;
const int DrawScreenOrder = EventClient::DrawScreenOrder;
-
- SETUP_EVENT(Update, ScriptIDOrder, false, 0);
- SETUP_EVENT(BZDBChange, GameStateOrder, false, 0);
+ SETUP_EVENT(Update, ScriptIDOrder, false, 0);
- SETUP_EVENT(CommandFallback, DrawScreenOrder,false, 0);
+ SETUP_EVENT(BZDBChange, GameStateOrder, false, 0);
- SETUP_EVENT(RecvChatMsg, ScriptIDOrder, false, 0);
- SETUP_EVENT(RecvLuaData, ScriptIDOrder, false, 0);
+ SETUP_EVENT(CommandFallback, DrawScreenOrder, false, 0);
- SETUP_EVENT(ServerJoined, GameStateOrder, false, 0);
- SETUP_EVENT(ServerParted, GameStateOrder, false, 0);
+ SETUP_EVENT(RecvChatMsg, ScriptIDOrder, false, 0);
+ SETUP_EVENT(RecvLuaData, ScriptIDOrder, false, 0);
- SETUP_EVENT(PlayerAdded, GameStateOrder, false, 0);
- SETUP_EVENT(PlayerRemoved, GameStateOrder, false, 0);
- SETUP_EVENT(PlayerSpawned, GameStateOrder, false, 0);
- SETUP_EVENT(PlayerKilled, GameStateOrder, false, 0);
- SETUP_EVENT(PlayerJumped, GameStateOrder, false, REQ_FULL_READ);
- SETUP_EVENT(PlayerLanded, GameStateOrder, false, REQ_FULL_READ);
- SETUP_EVENT(PlayerTeleported, GameStateOrder, false, REQ_FULL_READ);
- SETUP_EVENT(PlayerTeamChange, GameStateOrder, false, 0);
- SETUP_EVENT(PlayerScoreChange, GameStateOrder, false, 0);
+ SETUP_EVENT(ServerJoined, GameStateOrder, false, 0);
+ SETUP_EVENT(ServerParted, GameStateOrder, false, 0);
- SETUP_EVENT(ShotAdded, GameStateOrder, false, REQ_FULL_READ);
- SETUP_EVENT(ShotRemoved, GameStateOrder, false, REQ_FULL_READ);
- SETUP_EVENT(ShotRicochet, GameStateOrder, false, REQ_FULL_READ);
- SETUP_EVENT(ShotTeleported, GameStateOrder, false, REQ_FULL_READ);
+ SETUP_EVENT(PlayerAdded, GameStateOrder, false, 0);
+ SETUP_EVENT(PlayerRemoved, GameStateOrder, false, 0);
+ SETUP_EVENT(PlayerSpawned, GameStateOrder, false, 0);
+ SETUP_EVENT(PlayerKilled, GameStateOrder, false, 0);
+ SETUP_EVENT(PlayerJumped, GameStateOrder, false, REQ_FULL_READ);
+ SETUP_EVENT(PlayerLanded, GameStateOrder, false, REQ_FULL_READ);
+ SETUP_EVENT(PlayerTeleported, GameStateOrder, false, REQ_FULL_READ);
+ SETUP_EVENT(PlayerTeamChange, GameStateOrder, false, 0);
+ SETUP_EVENT(PlayerScoreChange, GameStateOrder, false, 0);
- SETUP_EVENT(FlagAdded, GameStateOrder, false, 0);
- SETUP_EVENT(FlagRemoved, GameStateOrder, false, 0);
- SETUP_EVENT(FlagGrabbed, GameStateOrder, false, 0);
- SETUP_EVENT(FlagDropped, GameStateOrder, false, 0);
- SETUP_EVENT(FlagCaptured, GameStateOrder, false, 0);
- SETUP_EVENT(FlagTransferred, GameStateOrder, false, 0);
+ SETUP_EVENT(ShotAdded, GameStateOrder, false, REQ_FULL_READ);
+ SETUP_EVENT(ShotRemoved, GameStateOrder, false, REQ_FULL_READ);
+ SETUP_EVENT(ShotRicochet, GameStateOrder, false, REQ_FULL_READ);
+ SETUP_EVENT(ShotTeleported, GameStateOrder, false, REQ_FULL_READ);
- SETUP_EVENT(GLResize, DrawScreenOrder, false, 0);
- SETUP_EVENT(GLContextInit, DrawScreenOrder, false, 0);
- SETUP_EVENT(GLContextFree, DrawScreenOrder, false, 0);
- SETUP_EVENT(GLUnmapped, DrawScreenOrder, false, 0);
+ SETUP_EVENT(FlagAdded, GameStateOrder, false, 0);
+ SETUP_EVENT(FlagRemoved, GameStateOrder, false, 0);
+ SETUP_EVENT(FlagGrabbed, GameStateOrder, false, 0);
+ SETUP_EVENT(FlagDropped, GameStateOrder, false, 0);
+ SETUP_EVENT(FlagCaptured, GameStateOrder, false, 0);
+ SETUP_EVENT(FlagTransferred, GameStateOrder, false, 0);
- SETUP_EVENT(DrawGenesis, DrawScreenOrder, true, 0);
- SETUP_EVENT(DrawWorldStart, DrawWorldOrder, true, 0);
- SETUP_EVENT(DrawWorld, DrawWorldOrder, true, 0);
- SETUP_EVENT(DrawWorldAlpha, DrawWorldOrder, true, 0);
- SETUP_EVENT(DrawWorldShadow, DrawWorldOrder, true, 0);
- SETUP_EVENT(DrawScreenStart, DrawScreenOrder, true, 0);
- SETUP_EVENT(DrawScreen, DrawScreenOrder, true, 0);
- SETUP_EVENT(DrawRadar, DrawScreenOrder, true, 0);
+ SETUP_EVENT(GLResize, DrawScreenOrder, false, 0);
+ SETUP_EVENT(GLContextInit, DrawScreenOrder, false, 0);
+ SETUP_EVENT(GLContextFree, DrawScreenOrder, false, 0);
+ SETUP_EVENT(GLUnmapped, DrawScreenOrder, false, 0);
- SETUP_EVENT(KeyPress, DrawScreenOrder, false, REQ_INPUT_CTRL);
- SETUP_EVENT(KeyRelease, DrawScreenOrder, false, REQ_INPUT_CTRL);
- SETUP_EVENT(MousePress, DrawScreenOrder, false, REQ_INPUT_CTRL);
- SETUP_EVENT(MouseMove, DrawScreenOrder, false, REQ_INPUT_CTRL);
- SETUP_EVENT(MouseRelease, DrawScreenOrder, false, REQ_INPUT_CTRL);
- SETUP_EVENT(MouseWheel, DrawScreenOrder, false, REQ_INPUT_CTRL);
- SETUP_EVENT(IsAbove, DrawScreenOrder, false, REQ_INPUT_CTRL);
- SETUP_EVENT(GetTooltip, DrawScreenOrder, false, REQ_INPUT_CTRL);
+ SETUP_EVENT(DrawGenesis, DrawScreenOrder, true, 0);
+ SETUP_EVENT(DrawWorldStart, DrawWorldOrder, true, 0);
+ SETUP_EVENT(DrawWorld, DrawWorldOrder, true, 0);
+ SETUP_EVENT(DrawWorldAlpha, DrawWorldOrder, true, 0);
+ SETUP_EVENT(DrawWorldShadow, DrawWorldOrder, true, 0);
+ SETUP_EVENT(DrawScreenStart, DrawScreenOrder, true, 0);
+ SETUP_EVENT(DrawScreen, DrawScreenOrder, true, 0);
+ SETUP_EVENT(DrawRadar, DrawScreenOrder, true, 0);
- SETUP_EVENT(WordComplete, DrawScreenOrder, false, REQ_INPUT_CTRL);
+ SETUP_EVENT(KeyPress, DrawScreenOrder, false, REQ_INPUT_CTRL);
+ SETUP_EVENT(KeyRelease, DrawScreenOrder, false, REQ_INPUT_CTRL);
+ SETUP_EVENT(MousePress, DrawScreenOrder, false, REQ_INPUT_CTRL);
+ SETUP_EVENT(MouseMove, DrawScreenOrder, false, REQ_INPUT_CTRL);
+ SETUP_EVENT(MouseRelease, DrawScreenOrder, false, REQ_INPUT_CTRL);
+ SETUP_EVENT(MouseWheel, DrawScreenOrder, false, REQ_INPUT_CTRL);
+ SETUP_EVENT(IsAbove, DrawScreenOrder, false, REQ_INPUT_CTRL);
+ SETUP_EVENT(GetTooltip, DrawScreenOrder, false, REQ_INPUT_CTRL);
- SETUP_EVENT(ForbidSpawn, GameStateOrder, false, REQ_GAME_CTRL);
- SETUP_EVENT(ForbidJump, GameStateOrder, false, REQ_GAME_CTRL);
- SETUP_EVENT(ForbidShot, GameStateOrder, false, REQ_GAME_CTRL);
- SETUP_EVENT(ForbidShotLock, GameStateOrder, false, REQ_GAME_CTRL);
- SETUP_EVENT(ForbidFlagDrop, GameStateOrder, false, REQ_GAME_CTRL);
+ SETUP_EVENT(WordComplete, DrawScreenOrder, false, REQ_INPUT_CTRL);
+
+ SETUP_EVENT(ForbidSpawn, GameStateOrder, false, REQ_GAME_CTRL);
+ SETUP_EVENT(ForbidJump, GameStateOrder, false, REQ_GAME_CTRL);
+ SETUP_EVENT(ForbidShot, GameStateOrder, false, REQ_GAME_CTRL);
+ SETUP_EVENT(ForbidShotLock, GameStateOrder, false, REQ_GAME_CTRL);
+ SETUP_EVENT(ForbidFlagDrop, GameStateOrder, false, REQ_GAME_CTRL);
}
Modified: trunk/bzflag/src/bzflag/Player.cxx
===================================================================
--- trunk/bzflag/src/bzflag/Player.cxx 2009-03-31 18:33:15 UTC (rev 19560)
+++ trunk/bzflag/src/bzflag/Player.cxx 2009-03-31 20:00:35 UTC (rev 19561)
@@ -1296,8 +1296,8 @@
// check to see if we will fall on anything, if so THAT is our z limit
World *world = World::getWorld();
if (world) {
- const Obstacle* obstacle = world->hitBuilding(inputPos, inputAzimuth,
- predictedPos, predictedAzimuth, dimensions[0], dimensions[1],
+ const Obstacle* obstacle = world->hitBuilding(inputPos, inputAzimuth,
+ predictedPos, predictedAzimuth, dimensions[0], dimensions[1],
dimensions[2], isSolid());
// did they hit something?
Modified: trunk/bzflag/src/bzflag/RadarRenderer.cxx
===================================================================
--- trunk/bzflag/src/bzflag/RadarRenderer.cxx 2009-03-31 18:33:15 UTC (rev 19560)
+++ trunk/bzflag/src/bzflag/RadarRenderer.cxx 2009-03-31 20:00:35 UTC (rev 19561)
@@ -615,7 +615,7 @@
} else {
radarRange = -radarRange; // absolute
}
-
+
float maxRange = radarLimit;
// when burrowed, limit radar range to (1/4)
if (myTank && (myTank->getFlag() == Flags::Burrow) &&
Modified: trunk/bzflag/src/bzflag/bzflag.cxx
===================================================================
--- trunk/bzflag/src/bzflag/bzflag.cxx 2009-03-31 18:33:15 UTC (rev 19560)
+++ trunk/bzflag/src/bzflag/bzflag.cxx 2009-03-31 20:00:35 UTC (rev 19561)
@@ -1229,7 +1229,7 @@
OpenGLGState::init();
// run-time GL version check
- if (!GLEW_VERSION_1_1) {
+ if (!GLEW_VERSION_1_2) {
// DIE
printFatalError("ERROR: OpenGL version 1.1 or later is required");
if (display != NULL) {
Modified: trunk/bzflag/src/bzfs/BZWReader.cxx
===================================================================
--- trunk/bzflag/src/bzfs/BZWReader.cxx 2009-03-31 18:33:15 UTC (rev 19560)
+++ trunk/bzflag/src/bzfs/BZWReader.cxx 2009-03-31 20:00:35 UTC (rev 19561)
@@ -190,7 +190,7 @@
{
static int depth = 0;
depth++;
-
+
const string upperToken = TextUtils::toupper(token);
CustomObjectMap::iterator it = customObjectMap.find(upperToken);
if (it == customObjectMap.end()) {
Modified: trunk/bzflag/src/bzfs/ListServerConnection.cxx
===================================================================
--- trunk/bzflag/src/bzfs/ListServerConnection.cxx 2009-03-31 18:33:15 UTC (rev \
19560)
+++ trunk/bzflag/src/bzfs/ListServerConnection.cxx 2009-03-31 20:00:35 UTC (rev \
19561) @@ -155,7 +155,7 @@
for (int i = 0; i < curMaxPlayers; i++) {
GameKeeper::Player* gkp = GameKeeper::Player::getPlayerByIndex(i);
if ((gkp != NULL) &&
- (TextUtils::compare_nocase(gkp->player.getCallSign(), nick.c_str()) == 0) &&
+ (TextUtils::compare_nocase(gkp->player.getCallSign(), nick.c_str()) == 0) &&
(gkp->_LSAState == GameKeeper::Player::verified)) {
gkp->setBzIdentifier(bzId);
logDebugMessage(3,"Set player (%s [%i]) bzId to (%s)\n",
Modified: trunk/bzflag/src/bzfs/WorldEventManager.cxx
===================================================================
--- trunk/bzflag/src/bzfs/WorldEventManager.cxx 2009-03-31 18:33:15 UTC (rev 19560)
+++ trunk/bzflag/src/bzfs/WorldEventManager.cxx 2009-03-31 20:00:35 UTC (rev 19561)
@@ -23,7 +23,7 @@
// initialize the singleton
-template <>
+template <>
WorldEventManager* Singleton<WorldEventManager>::_instance = \
(WorldEventManager*)NULL;
Modified: trunk/bzflag/src/common/ParseColor.cxx
===================================================================
--- trunk/bzflag/src/common/ParseColor.cxx 2009-03-31 18:33:15 UTC (rev 19560)
+++ trunk/bzflag/src/common/ParseColor.cxx 2009-03-31 20:00:35 UTC (rev 19561)
@@ -32,7 +32,7 @@
struct ColorMapData {
ColorMapData()
{
- data[0] = data[1] = data[2] = data[3] = 1.0f;
+ data[0] = data[1] = data[2] = data[3] = 1.0f;
}
ColorMapData(float r, float g, float b, float a = 1.0f)
{
@@ -161,7 +161,7 @@
if (*str == 0) {
return true;
}
-
+
float alpha;
if (sscanf(str, "%f", &alpha) > 0) {
color[3] = alpha;
Modified: trunk/bzflag/src/geometry/SphereSceneNode.cxx
===================================================================
--- trunk/bzflag/src/geometry/SphereSceneNode.cxx 2009-03-31 18:33:15 UTC (rev 19560)
+++ trunk/bzflag/src/geometry/SphereSceneNode.cxx 2009-03-31 20:00:35 UTC (rev 19561)
@@ -357,11 +357,7 @@
glClipPlane(GL_CLIP_PLANE0, groundPlane);
glEnable(GL_CLIP_PLANE0);
-#ifdef GL_VERSION_1_2
glEnable(GL_RESCALE_NORMAL);
-#else
- glEnable(GL_NORMALIZE);
-#endif
const bool transparent = sceneNode->transparent;
const bool stippled = transparent && !BZDBCache::blend;
@@ -437,11 +433,7 @@
}
glPopMatrix();
-#ifdef GL_VERSION_1_2
glDisable(GL_RESCALE_NORMAL);
-#else
- glDisable(GL_NORMALIZE);
-#endif
glDisable(GL_CLIP_PLANE0);
@@ -611,11 +603,7 @@
if (!BZDBCache::blend && sceneNode->transparent)
myStipple(sceneNode->color[3]);
if (BZDBCache::lighting) {
-#ifdef GL_VERSION_1_2
glEnable(GL_RESCALE_NORMAL);
-#else
- glEnable(GL_NORMALIZE);
-#endif
// draw with normals (normal is same as vertex!
// one of the handy properties of a sphere.)
if (highResolution) {
@@ -656,11 +644,7 @@
}
addTriangleCount(SphereLowRes * SphereLowRes * 2);
}
-#ifdef GL_VERSION_1_2
glDisable(GL_RESCALE_NORMAL);
-#else
- glDisable(GL_NORMALIZE);
-#endif
}
else {
// draw without normals
Modified: trunk/bzflag/src/lua/LuaTextures.cxx
===================================================================
--- trunk/bzflag/src/lua/LuaTextures.cxx 2009-03-31 18:33:15 UTC (rev 19560)
+++ trunk/bzflag/src/lua/LuaTextures.cxx 2009-03-31 20:00:35 UTC (rev 19561)
@@ -171,7 +171,7 @@
case 2: { format = GL_LUMINANCE_ALPHA; break; }
case 3: { format = GL_RGB; break; }
case 4: { format = GL_RGBA; break; }
- default: {
+ default: {
return false;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BZFlag-commits mailing list
BZFlag-commits@lists.SourceForge.net
https://lists.SourceForge.net/lists/listinfo/bzflag-commits
irc: #BZFlag @ irc.freenode.net
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic