pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge from master stuff

Browse Source
This commit is contained in:
KimLS 2014-05-23 16:10:23 -07:00
parent fd4343702f
commit 83270d0983
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/glm/glm/detail/dummy.cpp
View File

@ -41,7 +41,7 @@ struct material
glm::vec4 diffuse; // Dcm glm::vec4 diffuse; // Dcm
glm::vec4 specular; // Scm glm::vec4 specular; // Scm
float shininess; // Srm float shininess; // Srm
}; };
struct light struct light
{ {
glm::vec4 ambient; // Acli glm::vec4 ambient; // Acli
@ -58,7 +58,7 @@ struct light
float constantAttenuation; // K0 float constantAttenuation; // K0
float linearAttenuation; // K1 float linearAttenuation; // K1
float quadraticAttenuation;// K2 float quadraticAttenuation;// K2
}; };
// Sample 1 // Sample 1
#include <glm/vec3.hpp>// glm::vec3 #include <glm/vec3.hpp>// glm::vec3