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

bug fixes

Browse Source
This commit is contained in:
Anselme 2016-04-27 17:23:56 +02:00
parent b682002ecd
commit 378806c0a0
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ Makefile*
object_script.* object_script.*
debug debug
release release
shaders.cpp

10
CMakeLists.txt
View File

@ -1,8 +1,14 @@
project(SparrowRenderer) project(SparrowRenderer)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
# choose resource files
file(GLOB RESOURCES_FILES src/*.h shaders/*.glsl)
FILE(GLOB RES_SRC_FILE shaders/*.glsl)
SET(RESOURCE_DST_FILE shaders.cpp)
# choose source file # choose source file
file(GLOB LIB_SRC_LIST src/*.cpp src/glew.c) file(GLOB LIB_SRC_LIST src/*.cpp src/glew.c)
list(APPEND LIB_SRC_LIST ${RESOURCE_DST_FILE})
file(GLOB LIB_HEAD_LIST src/*.h) file(GLOB LIB_HEAD_LIST src/*.h)
#set compilation option #set compilation option
@ -14,10 +20,6 @@ if(CMAKE_BUILD_TYPE MATCHES "Debug")
add_definitions(-DRENDER_DEBUG) add_definitions(-DRENDER_DEBUG)
endif() endif()
file(GLOB RESOURCES_FILES src/*.h shaders/*.glsl)
FILE(GLOB RES_SRC_FILE shaders/*.glsl)
SET(RESOURCE_DST_FILE shaders.cpp)
set(CMAKE_TEMPLATE_PATH "../cmaketemplate") set(CMAKE_TEMPLATE_PATH "../cmaketemplate")
include(${CMAKE_TEMPLATE_PATH}/template.cmake) include(${CMAKE_TEMPLATE_PATH}/template.cmake)

2
src/phongmaterial.cpp
View File

@ -60,7 +60,7 @@ void PhongMaterial::bindAttributes(Shader* myShader)
diffuse_texture->bind(0); diffuse_texture->bind(0);
else else
{ {
glActiveTexture(0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
} }
} }

3
src/phongmaterial.h
View File

@ -8,12 +8,13 @@ class Texture;
class PhongMaterial : public Material class PhongMaterial : public Material
{ {
private: public: // TODO add setters for this
glm::vec3 ambient; glm::vec3 ambient;
glm::vec3 diffuse; glm::vec3 diffuse;
glm::vec3 specular; glm::vec3 specular;
float shininess; float shininess;
bool castShadow; bool castShadow;
private:
Texture* ambient_texture; Texture* ambient_texture;
Texture* diffuse_texture; Texture* diffuse_texture;
Texture* specular_texture; Texture* specular_texture;

2
src/pipeline.cpp
View File

@ -19,7 +19,7 @@ SimplePipeline::SimplePipeline(ShaderSource *forwardSource)
glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
m_isCrappy = forwardSource != NULL && SparrowRenderer::isModernOpenGLAvailable(); m_isCrappy = !(forwardSource != NULL && SparrowRenderer::isModernOpenGLAvailable());
if(!m_isCrappy) if(!m_isCrappy)
{ {
ForwardModule *forward = new ForwardModule(); ForwardModule *forward = new ForwardModule();