Commit 4e3f078e authored by hybrid's avatar hybrid

Merged all revisions up to 1975 from 1.5 branch. Boiled down to changes.txt...

Merged all revisions up to 1975 from 1.5 branch. Boiled down to changes.txt fix and terrain fix, all others were already commited.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1976 dfc29bdd-3216-0410-991c-e03cc46cb475
parent b2ea2b3f
...@@ -4,8 +4,8 @@ Changes in version 1.6 ...@@ -4,8 +4,8 @@ Changes in version 1.6
- Add a hitPosition out parameter to ISceneCollisionManager::getCollisionResultPosition() - this is a (small) API breaking change. - Add a hitPosition out parameter to ISceneCollisionManager::getCollisionResultPosition() - this is a (small) API breaking change.
-----------------------------------
Changes in version 1.5 (...12.2008) Changes in version 1.5 (15.12.2008)
- Construction calls for FPS camera changed to take speed in units/milliseconds, just as the setSpeed method does. - Construction calls for FPS camera changed to take speed in units/milliseconds, just as the setSpeed method does.
......
...@@ -131,7 +131,7 @@ namespace scene ...@@ -131,7 +131,7 @@ namespace scene
scene::CDynamicMeshBuffer *mb=0; scene::CDynamicMeshBuffer *mb=0;
const u32 numVertices = TerrainData.Size * TerrainData.Size; const u32 numVertices = TerrainData.Size * TerrainData.Size;
if (numVertices <65535) if (numVertices <= 65536)
{ {
//small enough for 16bit buffers //small enough for 16bit buffers
mb=new scene::CDynamicMeshBuffer(video::EVT_2TCOORDS, video::EIT_16BIT); mb=new scene::CDynamicMeshBuffer(video::EVT_2TCOORDS, video::EIT_16BIT);
...@@ -298,7 +298,7 @@ namespace scene ...@@ -298,7 +298,7 @@ namespace scene
// resize the vertex array for the mesh buffer one time (makes loading faster) // resize the vertex array for the mesh buffer one time (makes loading faster)
scene::CDynamicMeshBuffer *mb=0; scene::CDynamicMeshBuffer *mb=0;
const u32 numVertices = TerrainData.Size * TerrainData.Size; const u32 numVertices = TerrainData.Size * TerrainData.Size;
if (numVertices <65535) if (numVertices <= 65536)
{ {
//small enough for 16bit buffers //small enough for 16bit buffers
mb=new scene::CDynamicMeshBuffer(video::EVT_2TCOORDS, video::EIT_16BIT); mb=new scene::CDynamicMeshBuffer(video::EVT_2TCOORDS, video::EIT_16BIT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment