Updated version of glm

This commit is contained in:
KimLS
2015-01-22 16:52:50 -08:00
parent a71690b725
commit 03286f540a
270 changed files with 17903 additions and 16363 deletions
+2 -2
View File
@@ -251,12 +251,12 @@ void unregister_spell_event(int evt, int spell_id) {
}
Lua_Mob lua_spawn2(int npc_type, int grid, int unused, double x, double y, double z, double heading) {
auto position = xyz_heading(x, y, z, heading);
auto position = xyz_heading(x, y, z, heading);
return Lua_Mob(quest_manager.spawn2(npc_type, grid, unused, position));
}
Lua_Mob lua_unique_spawn(int npc_type, int grid, int unused, double x, double y, double z, double heading = 0.0) {
auto position = xyz_heading(x,y,z,heading);
auto position = xyz_heading(x, y, z, heading);
return Lua_Mob(quest_manager.unique_spawn(npc_type, grid, unused, position));
}
+2 -2
View File
@@ -1,6 +1,6 @@
#include "oriented_bounding_box.h"
#include <gtc/matrix_transform.hpp>
#include <gtx/transform.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtx/transform.hpp>
glm::mat4 CreateRotateMatrix(float rx, float ry, float rz) {
glm::mat4 rot_x(1.0f);
+2 -1
View File
@@ -1,7 +1,8 @@
#ifndef EQEMU_ORIENTED_BOUNDNG_BOX_H
#define EQEMU_ORIENTED_BOUNDNG_BOX_H
#include <glm.hpp>
#include <glm/vec3.hpp>
#include <glm/mat4x4.hpp>
class OrientedBoundingBox
{
+4
View File
@@ -20,6 +20,10 @@
#include <string>
#include <glm/vec2.hpp>
#include <glm/vec3.hpp>
#include <glm/vec4.hpp>
class xy_location {
public:
float m_X;