EpicSparrow/SparrowRenderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added version and removed all console output in Release

Browse Source
This commit is contained in:
Anselme FRANÇOIS 2016-06-04 14:40:37 +02:00
parent e0acfad727
commit cf07f30a00
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -1,6 +1,9 @@
project(SparrowRenderer) project(SparrowRenderer)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(VERSION_MAJOR 1)
set(VERSION_MINOR 0)
# choose resource files # choose resource files
file(GLOB RESOURCES_FILES src/*.h shaders/*.glsl) file(GLOB RESOURCES_FILES src/*.h shaders/*.glsl)
FILE(GLOB RES_SRC_FILE shaders/*.glsl) FILE(GLOB RES_SRC_FILE shaders/*.glsl)

32
src/sparrowrenderer.cpp
View File

@ -12,6 +12,8 @@
#include <iostream> #include <iostream>
#include "pipeline.h" #include "pipeline.h"
#include "scene.h" #include "scene.h"
#include "Version.h"
// main methods // main methods
bool SparrowRenderer::modernOpenglAvailable = false; bool SparrowRenderer::modernOpenglAvailable = false;
@ -22,27 +24,27 @@ void SparrowRenderer::initGL(int w, int h, bool forceCrappy)
GLenum err = glewInit(); GLenum err = glewInit();
if (GLEW_OK != err) if (GLEW_OK != err)
fprintf(stderr, "Warning: glewInit failed!\n"); fprintf(stderr, "Warning: glewInit failed!\n");
if (!forceCrappy &&
modernOpenglAvailable = !forceCrappy &&
GLEW_ARB_vertex_program && GLEW_ARB_vertex_program &&
GLEW_ARB_draw_buffers && GLEW_ARB_draw_buffers &&
GLEW_ARB_framebuffer_object && GLEW_ARB_framebuffer_object &&
glewIsSupported("GL_VERSION_3_3") && glewIsSupported("GL_VERSION_3_3") &&
GLEW_VERSION_3_3 && GLEW_VERSION_3_3 &&
strcmp("3.30",(const char *)glGetString(GL_SHADING_LANGUAGE_VERSION)) <= 0) strcmp("3.30",(const char *)glGetString(GL_SHADING_LANGUAGE_VERSION)) <= 0;
{
modernOpenglAvailable = true;
printf("Modern OpenGL available.\n");
}
else
{
modernOpenglAvailable = false;
fprintf(stderr, "Warning: modern OpenGL not supported!\nEnabling fallback crappy rendering mode\n");
}
std::cout << "OpenGL " << glGetString(GL_VERSION) << std::endl; #ifdef RENDER_DEBUG
std::cout << "GLSL " << glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl; printf("Using SparrowRenderer %d.%d\n\n", VERSION_MAJOR, VERSION_MINOR);
std::cout << "Renderer " << glGetString(GL_RENDERER) << std::endl; if(modernOpenglAvailable)
std::cout << "Vendor " << glGetString(GL_VENDOR) << std::endl; printf("Modern OpenGL available.\n");
else
fprintf(stderr, "Warning: modern OpenGL not supported!\nEnabling fallback crappy rendering mode\n");
printf("OpenGL %s\nGLSL %s\nRenderer %s\nVendor %s\n",
glGetString(GL_VERSION),
glGetString(GL_SHADING_LANGUAGE_VERSION),
glGetString(GL_RENDERER),
glGetString(GL_VENDOR));
#endif
resizeGL(w, h); resizeGL(w, h);
} }