townforge/tb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove some cruft

Browse Source
This commit is contained in:
michael tesch 2016-06-10 01:19:48 +02:00
parent 7dc22d774b
commit 1160242301
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -47,6 +47,7 @@ cmake_dependent_option(TB_CLIPBOARD_SDL2 "Clipboard SDL2" OFF
# Runtime/subsystem configurations
if(TB_BUILD_DEMO_GLFW)
set(TB_CLIPBOARD_GLFW On)
set(TB_IMAGE_LOADER_STB On)
elseif(TB_BUILD_DEMO_SDL2)
set(TB_CLIPBOARD_SDL2 On)
set(TB_SYSTEM_SDL On)

12
src/tb/renderers/tb_renderer_gl.cpp
View File

@ -340,18 +340,6 @@ void TBRendererGL::RenderBatch(Batch *batch)
#endif
}
#if 0
// Check for nonsensical texture coordinates(!)
for (int ii = 0; ii < batch->vertex_count; ii++)
{
if (batch->vertex[ii].u > 1.0 || batch->vertex[ii].v > 1.0)
std::cout << "nonsense! " << ii << ": "
<< batch->vertex[ii].x << "," << batch->vertex[ii].y << " ; "
<< batch->vertex[ii].u << "," << batch->vertex[ii].v << " -- "
<< batch->vertex[ii].u * 512 << "," << batch->vertex[ii].v * 512 << "\n";
}
#endif
// Flush
#if defined(TB_RENDERER_GLES_2) || defined(TB_RENDERER_GL3)
GLCALL(glBufferSubData(GL_ARRAY_BUFFER, 0, batch->vertex_count * sizeof(Vertex), (void *)&batch->vertex[0]));

13
src/tb/tb_config.h
View File

@ -68,7 +68,7 @@
/** Enable renderer using OpenGL ES. This renderer depends on TB_RENDERER_GL.
It is using GL ES version 2. */
#define TB_RENDERER_GLES_2
//#define TB_RENDERER_GLES_2
/** The width of the font glyph cache. Must be a power of two. */
#define TB_GLYPH_CACHE_WIDTH 512
@ -107,26 +107,21 @@
#if defined(ANDROID) || defined(__ANDROID__)
#define TB_SYSTEM_ANDROID
#define TB_CLIPBOARD_DUMMY
#elif defined(__linux) || defined(__linux__) || defined(__EMSCRIPTEN__)
#elif defined(__linux) || defined(__linux__)
#define TB_FILE_POSIX
#define TB_TARGET_LINUX
#define TB_SYSTEM_LINUX
#define TB_CLIPBOARD_DUMMY
//#define TB_CLIPBOARD_GLFW
#define TB_CLIPBOARD_GLFW
#elif MACOSX
#define TB_FILE_POSIX
#define TB_TARGET_MACOSX
#define TB_SYSTEM_LINUX
//#define TB_CLIPBOARD_SDL2
//#define TB_CLIPBOARD_GLFW
#define TB_CLIPBOARD_DUMMY
#define TB_CLIPBOARD_GLFW
#elif defined(_WIN32) || defined(__WIN32__) || defined(__WINDOWS__)
#define TB_FILE_POSIX
#define TB_TARGET_WINDOWS
#define TB_CLIPBOARD_WINDOWS
#define TB_SYSTEM_WINDOWS
#else
#warning "no TB system defined"
#endif
#endif // TB_CONFIG_H