Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 04:12:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove double glm includes

Browse source
This commit is contained in:
Stephen Birarda 2013-07-08 17:48:46 -07:00
parent 26a2b4672b
commit 7fa3052308
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/audio/src/AudioInjector.h
View file

@ -9,7 +9,6 @@
#ifndef __hifi__AudioInjector__ #ifndef __hifi__AudioInjector__
#define __hifi__AudioInjector__ #define __hifi__AudioInjector__
#include <glm/glm.hpp>
#include <glm/gtx/quaternion.hpp> #include <glm/gtx/quaternion.hpp>
#include <glm/gtx/component_wise.hpp> #include <glm/gtx/component_wise.hpp>

5
libraries/shared/src/Operative.cpp
View file

@ -6,16 +6,15 @@
// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. // Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
// //
#include <glm/glm.hpp>
#include <glm/gtx/quaternion.hpp> #include <glm/gtx/quaternion.hpp>
#include "NodeList.h" #include "NodeList.h"
#include "NodeTypes.h" #include "NodeTypes.h"
#include "Operative.h"
#include "PacketHeaders.h" #include "PacketHeaders.h"
#include "SharedUtil.h" #include "SharedUtil.h"
#include "Operative.h"
const float BUG_VOXEL_SIZE = 0.0625f / 128; const float BUG_VOXEL_SIZE = 0.0625f / 128;
glm::vec3 bugPosition = glm::vec3(BUG_VOXEL_SIZE * 20.0, BUG_VOXEL_SIZE * 30.0, BUG_VOXEL_SIZE * 20.0); glm::vec3 bugPosition = glm::vec3(BUG_VOXEL_SIZE * 20.0, BUG_VOXEL_SIZE * 30.0, BUG_VOXEL_SIZE * 20.0);
glm::vec3 bugDirection = glm::vec3(0, 0, 1); glm::vec3 bugDirection = glm::vec3(0, 0, 1);

2
libraries/shared/src/Operative.h
View file

@ -9,8 +9,6 @@
#ifndef __hifi__Operative__ #ifndef __hifi__Operative__
#define __hifi__Operative__ #define __hifi__Operative__
#include <iostream>
class Operative { class Operative {
public: public:
void run(); void run();