diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-02-21 13:38:12 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-02-21 13:38:12 +0000 |
| commit | 1a4ae6ca5cd3aac0fd639c554e824525d98676ea (patch) | |
| tree | 35ae5e26fc98c60c38a4365aef45a6342039cc56 /src | |
| parent | 028d9195a9a8482cff9ae4b2e3ea77d1de24b732 (diff) | |
sane version number,
conditional definition of missing OpenGL defines on win32,
updated planet collision warning message,
removed material loader debug messages
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/base/collision.cc | 2 | ||||
| -rw-r--r-- | src/model/material.cc | 2 | ||||
| -rw-r--r-- | src/render/gl.h | 10 | ||||
| -rw-r--r-- | src/render/render.cc | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/src/game/base/collision.cc b/src/game/base/collision.cc index 894ce95..e4a312a 100644 --- a/src/game/base/collision.cc +++ b/src/game/base/collision.cc @@ -37,7 +37,7 @@ void Collision::distance_test(core::EntityControlable *first, core::Entity *seco if ((second->moduletype() == star_enttype) && (d-r < 50.0f)) { first->owner()->send_warning("^3Warning: entering star corona!^N"); } else if ((second->moduletype() == planet_enttype) && (d-r < 15.0f)) { - first->owner()->send_warning("^3Warning: hard landing imminent!^N"); + first->owner()->send_warning("^3Warning: entering planet gravity well!^N"); } } } diff --git a/src/model/material.cc b/src/model/material.cc index 68e80a8..81adfae 100644 --- a/src/model/material.cc +++ b/src/model/material.cc @@ -121,7 +121,7 @@ void Material::load_shader(const std::string &shadername) } else { material = new Material(firstword); add(material); - con_debug << " " << firstword << std::endl; + //con_debug << " " << firstword << std::endl; } count++; } diff --git a/src/render/gl.h b/src/render/gl.h index c8e51eb..dc0b5a1 100644 --- a/src/render/gl.h +++ b/src/render/gl.h @@ -16,11 +16,21 @@ #include "math/color.h" #ifdef _WIN32 + +#ifndef GL_RESCALE_NORMAL #define GL_RESCALE_NORMAL 0x803A +#endif + +#ifndef GL_TEXTURE_MAX_LEVEL #define GL_TEXTURE_MAX_LEVEL 0x813D +#endif + +#ifndef GL_GENERATE_MIPMAP #define GL_GENERATE_MIPMAP 0x8191 #endif +#endif + /// wrapper namespace for OpenGL operations /** The gl namespace provides a wrapper to the OpenGL library functions. * All methods take floats or Vector3f and Color as parameters. diff --git a/src/render/render.cc b/src/render/render.cc index fbeec11..0c7b35d 100644 --- a/src/render/render.cc +++ b/src/render/render.cc @@ -74,7 +74,7 @@ void init(int width, int height) model::Material::init(); // size of the vertex array in megabytes - r_arraysize = core::Cvar::get("r_arraysize", 0.0f , core::Cvar::Archive); + r_arraysize = core::Cvar::get("r_arraysize", 64.0f , core::Cvar::Archive); r_arraysize->set_info("[int] size of the vertex array in Mb"); size_t mb = (size_t) r_arraysize->value(); |