diff options
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | osirion.kdevelop | 2 | ||||
| -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 |
6 files changed, 16 insertions, 6 deletions
diff --git a/configure.in b/configure.in index a7d8ef5..e4f6aff 100644 --- a/configure.in +++ b/configure.in @@ -2,11 +2,11 @@ AC_INIT(configure.in) dnl ---------------------------------------------------------------- dnl append SVN revision to the version number -OSIRIONVERSION='0.1' +OSIRIONVERSION='0.1.0' SVNREVISION=`svnversion $srcdir` if test ! -z "$SVNREVISION"; then - OSIRIONVERSION="${OSIRIONVERSION}_${SVNREVISION}" + OSIRIONVERSION="${OSIRIONVERSION}-svn${SVNREVISION}" fi AM_CONFIG_HEADER(src/config.h) diff --git a/osirion.kdevelop b/osirion.kdevelop index 81eb8cb..65328ac 100644 --- a/osirion.kdevelop +++ b/osirion.kdevelop @@ -21,7 +21,7 @@ </general> <kdevautoproject> <general> - <activetarget>src/osirion</activetarget> + <activetarget>src/model/libmodel.la</activetarget> <useconfiguration>debug</useconfiguration> </general> <run> 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(); |