Changeset 7112
- Timestamp:
- Jun 3, 2010, 11:00:13 AM (15 years ago)
- Location:
- code/branches/presentation3/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc
r7090 r7112 34 34 #include "InvisiblePickup.h" 35 35 36 #include <sstream> 37 #include <OgreEntity.h> 38 #include <OgreAnimationState.h> 39 40 #include "util/StringUtils.h" 36 41 #include "core/CoreIncludes.h" 37 42 #include "core/XMLPort.h" 38 #include "util/StringUtils.h"39 43 40 44 #include "worldentities/pawns/Pawn.h" 41 45 #include "pickup/PickupIdentifier.h" 42 43 #include <sstream>44 45 #include <OgreEntity.h>46 #include <Ogre.h>47 46 48 47 namespace orxonox -
code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h
r6710 r7112 38 38 39 39 #include <string> 40 40 41 #include <worldentities/pawns/Pawn.h> 41 42 #include "worldentities/StaticEntity.h" 42 43 43 #include "pickup/Pickup.h" 44 44 -
code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc
r7027 r7112 27 27 28 28 #include "AnimatedModel.h" 29 29 30 #include <OgreEntity.h> 30 #include <Ogre.h> 31 #include <deque> 31 #include <OgreAnimationState.h> 32 32 33 33 #include "core/CoreIncludes.h" -
code/branches/presentation3/src/orxonox/graphics/AnimatedModel.h
r6937 r7112 29 29 #ifndef _AnimatedModel_H__ 30 30 #define _AnimatedModel_H__ 31 32 #include "OrxonoxPrereqs.h" 33 34 #include <string> 35 #include "tools/interfaces/Tickable.h" 31 36 #include "Model.h" 32 #include "tools/interfaces/Tickable.h"33 #include "OrxonoxPrereqs.h"34 #include <deque>35 #include <string>36 #include "tools/Mesh.h"37 #include "worldentities/StaticEntity.h"38 37 39 38 namespace orxonox
Note: See TracChangeset
for help on using the changeset viewer.