server_common/recastnavigation_v1.6.0
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added mipmaps to the grid texture. Removed obsolete SoloMeshTiled sample.

Browse Source
This commit is contained in:
Mikko Mononen 2011-03-06 16:00:04 +00:00
parent e84d563bfe
commit 9f2390e196
8 changed files with 45 additions and 1313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
RecastDemo/Bin/Recast.app/Contents/MacOS/Recast
View File

Binary file not shown.

22
RecastDemo/Build/Xcode/Recast.xcodeproj/project.pbxproj
View File

@ -35,10 +35,8 @@
6B86C9AA12F69DD500C92D2E /* fastlz.c in Sources */ = {isa = PBXBuildFile; fileRef = 6B86C9A812F69DD500C92D2E /* fastlz.c */; };
6B8DE88910B69E3E00DF20FB /* DetourNavMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B8DE88710B69E3E00DF20FB /* DetourNavMesh.cpp */; };
6B8DE88A10B69E3E00DF20FB /* DetourNavMeshBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */; };
6B98463311E6144400FA177B /* Sample_SoloMeshTiled.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */; };
6B9846EF11E718F800FA177B /* DetourAlloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B9846EE11E718F800FA177B /* DetourAlloc.cpp */; };
6B9847B811E7519A00FA177B /* RecastAlloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B9847B711E7519A00FA177B /* RecastAlloc.cpp */; };
6BA1E88B10C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */; };
6BAF3C591211663A008CFCDF /* CrowdTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */; };
6BAF40DB12196A3D008CFCDF /* DetourNavMeshQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */; };
6BAF4442121C3D26008CFCDF /* SampleInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BAF4441121C3D26008CFCDF /* SampleInterfaces.cpp */; };
@ -56,6 +54,7 @@
6BB93C7F10CFE1D500F74F2B /* RecastDebugDraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB93C7C10CFE1D500F74F2B /* RecastDebugDraw.cpp */; };
6BB93CF610CFEC4500F74F2B /* RecastDump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */; };
6BCF32361104CD05009445BF /* OffMeshConnectionTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */; };
6BD1B1D01323E2EC00587F83 /* Sample_SoloMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BD1B1CF1323E2EC00587F83 /* Sample_SoloMesh.cpp */; };
6BD402011224279400995864 /* PerfTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BD402001224279400995864 /* PerfTimer.cpp */; };
6BF5F23A11747606000502A6 /* Filelist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BF5F23911747606000502A6 /* Filelist.cpp */; };
6BF5F2401174763B000502A6 /* SlideShow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BF5F23F1174763B000502A6 /* SlideShow.cpp */; };
@ -117,14 +116,10 @@
6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourNavMeshBuilder.cpp; path = ../../../Detour/Source/DetourNavMeshBuilder.cpp; sourceTree = SOURCE_ROOT; };
6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourNavMesh.h; path = ../../../Detour/Include/DetourNavMesh.h; sourceTree = SOURCE_ROOT; };
6B8DE88C10B69E4C00DF20FB /* DetourNavMeshBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourNavMeshBuilder.h; path = ../../../Detour/Include/DetourNavMeshBuilder.h; sourceTree = SOURCE_ROOT; };
6B98463111E6144400FA177B /* Sample_SoloMeshTiled.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sample_SoloMeshTiled.h; path = ../../Include/Sample_SoloMeshTiled.h; sourceTree = SOURCE_ROOT; };
6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sample_SoloMeshTiled.cpp; path = ../../Source/Sample_SoloMeshTiled.cpp; sourceTree = SOURCE_ROOT; };
6B9846ED11E718F800FA177B /* DetourAlloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourAlloc.h; path = ../../../Detour/Include/DetourAlloc.h; sourceTree = SOURCE_ROOT; };
6B9846EE11E718F800FA177B /* DetourAlloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourAlloc.cpp; path = ../../../Detour/Source/DetourAlloc.cpp; sourceTree = SOURCE_ROOT; };
6B98470511E733B600FA177B /* RecastAlloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecastAlloc.h; path = ../../../Recast/Include/RecastAlloc.h; sourceTree = SOURCE_ROOT; };
6B9847B711E7519A00FA177B /* RecastAlloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastAlloc.cpp; path = ../../../Recast/Source/RecastAlloc.cpp; sourceTree = SOURCE_ROOT; };
6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sample_SoloMeshSimple.cpp; path = ../../Source/Sample_SoloMeshSimple.cpp; sourceTree = SOURCE_ROOT; };
6BA1E88E10C7BFD3008007F6 /* Sample_SoloMeshSimple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sample_SoloMeshSimple.h; path = ../../Include/Sample_SoloMeshSimple.h; sourceTree = SOURCE_ROOT; };
6BAF3C571211663A008CFCDF /* CrowdTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CrowdTool.h; path = ../../Include/CrowdTool.h; sourceTree = SOURCE_ROOT; };
6BAF3C581211663A008CFCDF /* CrowdTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CrowdTool.cpp; path = ../../Source/CrowdTool.cpp; sourceTree = SOURCE_ROOT; };
6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourNavMeshQuery.h; path = ../../../Detour/Include/DetourNavMeshQuery.h; sourceTree = SOURCE_ROOT; };
@ -161,6 +156,8 @@
6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastDump.cpp; path = ../../../DebugUtils/Source/RecastDump.cpp; sourceTree = SOURCE_ROOT; };
6BCF32341104CD05009445BF /* OffMeshConnectionTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OffMeshConnectionTool.h; path = ../../Include/OffMeshConnectionTool.h; sourceTree = SOURCE_ROOT; };
6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OffMeshConnectionTool.cpp; path = ../../Source/OffMeshConnectionTool.cpp; sourceTree = SOURCE_ROOT; };
6BD1B1CE1323E2EC00587F83 /* Sample_SoloMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sample_SoloMesh.h; path = ../../Include/Sample_SoloMesh.h; sourceTree = SOURCE_ROOT; };
6BD1B1CF1323E2EC00587F83 /* Sample_SoloMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sample_SoloMesh.cpp; path = ../../Source/Sample_SoloMesh.cpp; sourceTree = SOURCE_ROOT; };
6BD401FF1224278800995864 /* PerfTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerfTimer.h; path = ../../Include/PerfTimer.h; sourceTree = SOURCE_ROOT; };
6BD402001224279400995864 /* PerfTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerfTimer.cpp; path = ../../Source/PerfTimer.cpp; sourceTree = SOURCE_ROOT; };
6BF5F23911747606000502A6 /* Filelist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Filelist.cpp; path = ../../Source/Filelist.cpp; sourceTree = SOURCE_ROOT; };
@ -321,16 +318,14 @@
children = (
6B25B6100FFA62AD004F1BC4 /* Sample.h */,
6B25B6140FFA62BE004F1BC4 /* Sample.cpp */,
6BA1E88E10C7BFD3008007F6 /* Sample_SoloMeshSimple.h */,
6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */,
6B98463111E6144400FA177B /* Sample_SoloMeshTiled.h */,
6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */,
6BD1B1CE1323E2EC00587F83 /* Sample_SoloMesh.h */,
6BD1B1CF1323E2EC00587F83 /* Sample_SoloMesh.cpp */,
6B2AEC510FFB8946005BE9CC /* Sample_TileMesh.h */,
6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */,
6B8036AC113BAABE005ED67B /* Sample_Debug.h */,
6B8036AD113BAABE005ED67B /* Sample_Debug.cpp */,
6B5683B612D9E7D3000B9960 /* Sample_TempObstacles.h */,
6B5683B712D9E7D3000B9960 /* Sample_TempObstacles.cpp */,
6B8036AC113BAABE005ED67B /* Sample_Debug.h */,
6B8036AD113BAABE005ED67B /* Sample_Debug.cpp */,
);
name = Samples;
sourceTree = "<group>";
@ -490,7 +485,6 @@
6B62416A103434880002E346 /* RecastMeshDetail.cpp in Sources */,
6B8DE88910B69E3E00DF20FB /* DetourNavMesh.cpp in Sources */,
6B8DE88A10B69E3E00DF20FB /* DetourNavMeshBuilder.cpp in Sources */,
6BA1E88B10C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp in Sources */,
6BB93C7D10CFE1D500F74F2B /* DebugDraw.cpp in Sources */,
6BB93C7E10CFE1D500F74F2B /* DetourDebugDraw.cpp in Sources */,
6BB93C7F10CFE1D500F74F2B /* RecastDebugDraw.cpp in Sources */,
@ -504,7 +498,6 @@
6B8036AE113BAABE005ED67B /* Sample_Debug.cpp in Sources */,
6BF5F23A11747606000502A6 /* Filelist.cpp in Sources */,
6BF5F2401174763B000502A6 /* SlideShow.cpp in Sources */,
6B98463311E6144400FA177B /* Sample_SoloMeshTiled.cpp in Sources */,
6B9846EF11E718F800FA177B /* DetourAlloc.cpp in Sources */,
6B9847B811E7519A00FA177B /* RecastAlloc.cpp in Sources */,
6BAF3C591211663A008CFCDF /* CrowdTool.cpp in Sources */,
@ -521,6 +514,7 @@
6BB501E312F46B6A001B1957 /* DetourObstacleAvoidance.cpp in Sources */,
6B86C9AA12F69DD500C92D2E /* fastlz.c in Sources */,
6B3F9D6D13179EFC000B33D9 /* RecastLayers.cpp in Sources */,
6BD1B1D01323E2EC00587F83 /* Sample_SoloMesh.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

10
RecastDemo/Include/Sample_SoloMeshSimple.h → RecastDemo/Include/Sample_SoloMesh.h
View File

@ -16,14 +16,14 @@
// 3. This notice may not be removed or altered from any source distribution.
//
#ifndef RECASTSAMPLESOLOMESHSIMPLE_H
#define RECASTSAMPLESOLOMESHSIMPLE_H
#ifndef RECASTSAMPLESOLOMESH_H
#define RECASTSAMPLESOLOMESH_H
#include "Sample.h"
#include "DetourNavMesh.h"
#include "Recast.h"
class Sample_SoloMeshSimple : public Sample
class Sample_SoloMesh : public Sample
{
protected:
bool m_keepInterResults;
@ -64,8 +64,8 @@ protected:
void cleanup();
public:
Sample_SoloMeshSimple();
virtual ~Sample_SoloMeshSimple();
Sample_SoloMesh();
virtual ~Sample_SoloMesh();
virtual void handleSettings();
virtual void handleTools();

124
RecastDemo/Include/Sample_SoloMeshTiled.h
View File

@ -1,124 +0,0 @@
//
// Copyright (c) 2009-2010 Mikko Mononen memon@inside.org
//
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would be
// appreciated but is not required.
// 2. Altered source versions must be plainly marked as such, and must not be
// misrepresented as being the original software.
// 3. This notice may not be removed or altered from any source distribution.
//
#ifndef RECASTSAMPLESOLOMESHTILED_H
#define RECASTSAMPLESOLOMESHTILED_H
#include "Sample.h"
#include "DetourNavMesh.h"
#include "Recast.h"
#include "ChunkyTriMesh.h"
class Sample_SoloMeshTiled : public Sample
{
protected:
struct Tile
{
inline Tile() : chf(0), solid(0), cset(0), pmesh(0), dmesh(0), buildTime(0) {}
inline ~Tile()
{
rcFreeCompactHeightfield(chf);
rcFreeContourSet(cset);
rcFreeHeightField(solid);
rcFreePolyMesh(pmesh);
rcFreePolyMeshDetail(dmesh);
}
int x, y;
rcCompactHeightfield* chf;
rcHeightfield* solid;
rcContourSet* cset;
rcPolyMesh* pmesh;
rcPolyMeshDetail* dmesh;
int buildTime;
};
struct TileSet
{
inline TileSet() : width(0), height(0), tiles(0) {}
inline ~TileSet() { delete [] tiles; }
int width, height;
float bmin[3], bmax[3];
float cs, ch;
Tile* tiles;
};
bool m_measurePerTileTimings;
bool m_keepInterResults;
float m_tileSize;
float m_totalBuildTimeMs;
rcPolyMesh* m_pmesh;
rcPolyMeshDetail* m_dmesh;
rcConfig m_cfg;
TileSet* m_tileSet;
static const int MAX_STAT_BUCKETS = 1000;
int m_statPolysPerTile[MAX_STAT_BUCKETS];
int m_statPolysPerTileSamples;
int m_statTimePerTile[MAX_STAT_BUCKETS];
int m_statTimePerTileSamples;
int m_highLightedTileX, m_highLightedTileY;
enum DrawMode
{
DRAWMODE_NAVMESH,
DRAWMODE_NAVMESH_TRANS,
DRAWMODE_NAVMESH_BVTREE,
DRAWMODE_NAVMESH_NODES,
DRAWMODE_NAVMESH_INVIS,
DRAWMODE_MESH,
DRAWMODE_VOXELS,
DRAWMODE_VOXELS_WALKABLE,
DRAWMODE_COMPACT,
DRAWMODE_COMPACT_DISTANCE,
DRAWMODE_COMPACT_REGIONS,
DRAWMODE_REGION_CONNECTIONS,
DRAWMODE_RAW_CONTOURS,
DRAWMODE_BOTH_CONTOURS,
DRAWMODE_CONTOURS,
DRAWMODE_POLYMESH,
DRAWMODE_POLYMESH_DETAIL,
MAX_DRAWMODE
};
DrawMode m_drawMode;
void cleanup();
bool canDrawTile(int x, int y);
public:
Sample_SoloMeshTiled();
virtual ~Sample_SoloMeshTiled();
virtual void handleSettings();
virtual void handleTools();
virtual void handleDebugMode();
virtual void handleRender();
virtual void handleRenderOverlay(double* proj, double* model, int* view);
virtual void handleMeshChanged(class InputGeom* geom);
virtual bool handleBuild();
void setHighlightedTile(const float* pos);
inline int getHilightedTileX() const { return m_highLightedTileX; }
inline int getHilightedTileY() const { return m_highLightedTileY; }
};
#endif // RECASTSAMPLESOLOMESHTILED_H

22
RecastDemo/Source/SampleInterfaces.cpp
View File

@ -159,15 +159,25 @@ public:
// Create checker pattern.
const unsigned int col0 = duRGBA(215,215,215,255);
const unsigned int col1 = duRGBA(255,255,255,255);
static const int TSIZE = 32;
static const int TSIZE = 64;
unsigned int data[TSIZE*TSIZE];
for (int y = 0; y < TSIZE; ++y)
for (int x = 0; x < TSIZE; ++x)
data[x+y*TSIZE] = (x==0 || y==0) ? col0 : col1;
glGenTextures(1, &m_texId);
glBindTexture(GL_TEXTURE_2D, m_texId);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, TSIZE,TSIZE, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
int level = 0;
int size = TSIZE;
while (size > 0)
{
for (int y = 0; y < size; ++y)
for (int x = 0; x < size; ++x)
data[x+y*size] = (x==0 || y==0) ? col0 : col1;
glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, size,size, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
size /= 2;
level++;
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
}
else

22
RecastDemo/Source/Sample_SoloMeshSimple.cpp → RecastDemo/Source/Sample_SoloMesh.cpp
View File

@ -25,7 +25,7 @@
#include "imgui.h"
#include "InputGeom.h"
#include "Sample.h"
#include "Sample_SoloMeshSimple.h"
#include "Sample_SoloMesh.h"
#include "Recast.h"
#include "RecastDebugDraw.h"
#include "RecastDump.h"
@ -42,7 +42,7 @@
#endif
Sample_SoloMeshSimple::Sample_SoloMeshSimple() :
Sample_SoloMesh::Sample_SoloMesh() :
m_keepInterResults(true),
m_totalBuildTimeMs(0),
m_triareas(0),
@ -56,12 +56,12 @@ Sample_SoloMeshSimple::Sample_SoloMeshSimple() :
setTool(new NavMeshTesterTool);
}
Sample_SoloMeshSimple::~Sample_SoloMeshSimple()
Sample_SoloMesh::~Sample_SoloMesh()
{
cleanup();
}
void Sample_SoloMeshSimple::cleanup()
void Sample_SoloMesh::cleanup()
{
delete [] m_triareas;
m_triareas = 0;
@ -79,7 +79,7 @@ void Sample_SoloMeshSimple::cleanup()
m_navMesh = 0;
}
void Sample_SoloMeshSimple::handleSettings()
void Sample_SoloMesh::handleSettings()
{
Sample::handleCommonSettings();
@ -95,7 +95,7 @@ void Sample_SoloMeshSimple::handleSettings()
imguiSeparator();
}
void Sample_SoloMeshSimple::handleTools()
void Sample_SoloMesh::handleTools()
{
int type = !m_tool ? TOOL_NONE : m_tool->type();
@ -127,7 +127,7 @@ void Sample_SoloMeshSimple::handleTools()
}
void Sample_SoloMeshSimple::handleDebugMode()
void Sample_SoloMesh::handleDebugMode()
{
// Check which modes are valid.
bool valid[MAX_DRAWMODE];
@ -205,7 +205,7 @@ void Sample_SoloMeshSimple::handleDebugMode()
}
}
void Sample_SoloMeshSimple::handleRender()
void Sample_SoloMesh::handleRender()
{
if (!m_geom || !m_geom->getMesh())
return;
@ -318,13 +318,13 @@ void Sample_SoloMeshSimple::handleRender()
glDepthMask(GL_TRUE);
}
void Sample_SoloMeshSimple::handleRenderOverlay(double* proj, double* model, int* view)
void Sample_SoloMesh::handleRenderOverlay(double* proj, double* model, int* view)
{
if (m_tool)
m_tool->handleRenderOverlay(proj, model, view);
}
void Sample_SoloMeshSimple::handleMeshChanged(class InputGeom* geom)
void Sample_SoloMesh::handleMeshChanged(class InputGeom* geom)
{
Sample::handleMeshChanged(geom);
@ -339,7 +339,7 @@ void Sample_SoloMeshSimple::handleMeshChanged(class InputGeom* geom)
}
bool Sample_SoloMeshSimple::handleBuild()
bool Sample_SoloMesh::handleBuild()
{
if (!m_geom || !m_geom->getMesh())
{

1142
RecastDemo/Source/Sample_SoloMeshTiled.cpp
View File

File diff suppressed because it is too large Load Diff

16
RecastDemo/Source/main.cpp
View File

@ -30,8 +30,7 @@
#include "Filelist.h"
#include "SlideShow.h"
#include "Sample_SoloMeshSimple.h"
#include "Sample_SoloMeshTiled.h"
#include "Sample_SoloMesh.h"
#include "Sample_TileMesh.h"
#include "Sample_TempObstacles.h"
#include "Sample_Debug.h"
@ -46,16 +45,14 @@ struct SampleItem
const char* name;
};
Sample* createSoloSimple() { return new Sample_SoloMeshSimple(); }
Sample* createSoloTiled() { return new Sample_SoloMeshTiled(); }
Sample* createSolo() { return new Sample_SoloMesh(); }
Sample* createTile() { return new Sample_TileMesh(); }
Sample* createDebug() { return new Sample_Debug(); }
Sample* createTempObstacle() { return new Sample_TempObstacles(); }
Sample* createDebug() { return new Sample_Debug(); }
static SampleItem g_samples[] =
{
{ createSoloSimple, "Solo Mesh Simple" },
{ createSoloTiled, "Solo Mesh Tiled" },
{ createSolo, "Solo Mesh" },
{ createTile, "Tile Mesh" },
{ createTempObstacle, "Temp Obstacles" },
// { createDebug, "Debug" },
@ -80,7 +77,7 @@ int main(int /*argc*/, char** /*argv*/)
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 8);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4);
const SDL_VideoInfo* vi = SDL_GetVideoInfo();
@ -171,9 +168,6 @@ int main(int /*argc*/, char** /*argv*/)
glDepthFunc(GL_LEQUAL);
// glEnable(GL_POINT_SMOOTH);
// glEnable(GL_LINE_SMOOTH);
bool done = false;
while(!done)
{