AuroraMiddleware/glm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://github.com/mysticbob/glm into linux

Browse Source
This commit is contained in:
Christophe Riccio 2011-02-17 11:16:59 +00:00
commit e53a528407
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
cmake_policy(VERSION 2.6) cmake_policy(VERSION 2.6)
project(glm) project(glm)
enable_testing()
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
#add_definitions(-S) #add_definitions(-S)
@ -14,12 +15,15 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
include_directories(".") include_directories(".")
add_subdirectory(glm) add_subdirectory(glm)
add_subdirectory(test) add_subdirectory(test)
add_subdirectory(bench) add_subdirectory(bench)
add_subdirectory(doc) add_subdirectory(doc)
option(GLM_DEVELOPMENT_MODE "GLM development" OFF) # option(GLM_DEVELOPMENT_MODE "GLM development" OFF)
if(NOT GLM_DEVELOPMENT_MODE) # if(NOT GLM_DEVELOPMENT_MODE)
message(FATAL_ERROR "GLM is a header only library, no need to build it") # message(FATAL_ERROR "GLM is a header only library, no need to build it")
endif() # endif()
install( DIRECTORY glm DESTINATION include )

4
glm/gtc/matrix_transform.inl
View File

@ -332,14 +332,14 @@ namespace matrix_transform
detail::tvec4<U> const & viewport detail::tvec4<U> const & viewport
) )
{ {
assert(delta.x > 0.0f && delta.y > 0.0f) assert(delta.x > 0.0f && delta.y > 0.0f);
detail::tmat4x4<T> Result(1.0f); detail::tmat4x4<T> Result(1.0f);
if(!(delta.x > 0.0f && delta.y > 0.0f)) if(!(delta.x > 0.0f && delta.y > 0.0f))
return Result; // Error return Result; // Error
// Translate and scale the picked region to the entire window // Translate and scale the picked region to the entire window
Result = translate(Result, (T(viewport[2]) - T(2) * (x - T(viewport[0]))) / delta.x, (T(viewport[3]) - T(2) * (y - T(viewport[1]))) / delta.y, T(0)); Result = translate(Result, (T(viewport[2]) - T(2) * (center.x - T(viewport[0]))) / delta.x, (T(viewport[3]) - T(2) * (center.y - T(viewport[1]))) / delta.y, T(0));
return scale(Result, T(viewport[2]) / delta.x, T(viewport[3]) / delta.y, T(1)); return scale(Result, T(viewport[2]) / delta.x, T(viewport[3]) / delta.y, T(1));
} }

2
glm/gtc/quaternion.inl
View File

@ -403,7 +403,7 @@ namespace quaternion{
if(flip) if(flip)
alpha = -alpha; alpha = -alpha;
return normalize(beta * x + alpha * y2); return normalize(beta * x + alpha * y);
} }
template <typename T> template <typename T>

6
test/CMakeLists.txt
View File

@ -1,8 +1,10 @@
function(glmCreateTestGTC NAME) function(glmCreateTestGTC NAME)
set(SAMPLE_NAME test-${NAME}) set(SAMPLE_NAME test-${NAME})
add_executable(${SAMPLE_NAME} ${NAME}.cpp ../test.hpp ../test.cpp) add_executable(${SAMPLE_NAME} ${NAME}.cpp ../test.hpp ../test.cpp)
endfunction(glmCreateTestGTC) add_test(
NAME ${SAMPLE_NAME}
COMMAND $<TARGET_FILE:${SAMPLE_NAME}> )
endfunction()
add_subdirectory(bug) add_subdirectory(bug)
add_subdirectory(core) add_subdirectory(core)