diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ba110f..97a9f9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ project(SparrowRenderer) cmake_minimum_required(VERSION 2.8) +set(VERSION_MAJOR 1) +set(VERSION_MINOR 0) + # choose resource files file(GLOB RESOURCES_FILES src/*.h shaders/*.glsl) FILE(GLOB RES_SRC_FILE shaders/*.glsl) diff --git a/src/sparrowrenderer.cpp b/src/sparrowrenderer.cpp index c1a5a2e..1492745 100644 --- a/src/sparrowrenderer.cpp +++ b/src/sparrowrenderer.cpp @@ -12,6 +12,8 @@ #include #include "pipeline.h" #include "scene.h" +#include "Version.h" + // main methods bool SparrowRenderer::modernOpenglAvailable = false; @@ -22,27 +24,27 @@ void SparrowRenderer::initGL(int w, int h, bool forceCrappy) GLenum err = glewInit(); if (GLEW_OK != err) fprintf(stderr, "Warning: glewInit failed!\n"); - if (!forceCrappy && - GLEW_ARB_vertex_program && - GLEW_ARB_draw_buffers && - GLEW_ARB_framebuffer_object && - glewIsSupported("GL_VERSION_3_3") && - GLEW_VERSION_3_3 && - 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; - std::cout << "GLSL " << glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl; - std::cout << "Renderer " << glGetString(GL_RENDERER) << std::endl; - std::cout << "Vendor " << glGetString(GL_VENDOR) << std::endl; + modernOpenglAvailable = !forceCrappy && + GLEW_ARB_vertex_program && + GLEW_ARB_draw_buffers && + GLEW_ARB_framebuffer_object && + glewIsSupported("GL_VERSION_3_3") && + GLEW_VERSION_3_3 && + strcmp("3.30",(const char *)glGetString(GL_SHADING_LANGUAGE_VERSION)) <= 0; + +#ifdef RENDER_DEBUG + printf("Using SparrowRenderer %d.%d\n\n", VERSION_MAJOR, VERSION_MINOR); + if(modernOpenglAvailable) + 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); }