mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 12:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed pick function... again

Browse Source
This commit is contained in:
Christophe Riccio 2011-03-11 02:15:15 +00:00
parent c6b7592246
commit b918e3ea3f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/gtc/matrix_transform.inl
View File

@ -359,7 +359,7 @@ namespace matrix_transform
// Translate and scale the picked region to the entire window // Translate and scale the picked region to the entire window
Result = translate(Result, Temp); Result = translate(Result, Temp);
return scale(Result, T(viewport[2]) / delta.x, T(viewport[3]) / delta.y, T(1)); return scale(Result, detail::tvec3<T>(T(viewport[2]) / delta.x, T(viewport[3]) / delta.y, T(1)));
} }
template <typename T> template <typename T>

2
test/gtc/gtc_matrix_transform.cpp
View File

@ -14,6 +14,8 @@
int main() int main()
{ {
int Failed = 0; int Failed = 0;
glm::mat4 Pick = glm::pickMatrix(glm::vec2(1, 2), glm::vec2(3, 4), glm::ivec4(0, 0, 320, 240));
return Failed; return Failed;
} }