mirror of
https://github.com/SWG-Source/src.git
synced 2026-08-02 02:15:58 -04:00
Removed STLport requirement
This commit is contained in:
@@ -15,6 +15,7 @@
|
||||
#include "sharedObject/ContainedByProperty.h"
|
||||
#include "sharedObject/Object.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdio>
|
||||
|
||||
// ======================================================================
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "sharedObject/Object.h"
|
||||
#include "UnicodeUtils.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "sharedFoundation/NetworkId.h"
|
||||
#include "sharedObject/Object.h"
|
||||
|
||||
#include <hash_map>
|
||||
#include <tr1/unordered_map>
|
||||
#include <string>
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
@@ -16,7 +16,7 @@ class NetworkIdManager
|
||||
public:
|
||||
~NetworkIdManager();
|
||||
|
||||
typedef stdhash_map<NetworkId, Object *, NetworkId::Hash>::fwd NetworkIdObjectHashMap;
|
||||
typedef stdunordered_map<NetworkId, Object *, NetworkId::Hash>::fwd NetworkIdObjectHashMap;
|
||||
|
||||
static void addObject (Object & newObject);
|
||||
static Object * getObjectById (const NetworkId & source);
|
||||
|
||||
@@ -559,7 +559,7 @@ void ObjectNamespace::deleteLocalTransform(Transform *transform)
|
||||
|
||||
void ObjectNamespace::validatePosition(Object const & object, Vector const & position)
|
||||
{
|
||||
if (abs(position.x) > 16000.0f || abs(position.y) > 16000.0f || abs(position.z) > 16000.0f)
|
||||
if (std::abs(position.x) > 16000.0f || std::abs(position.y) > 16000.0f || std::abs(position.z) > 16000.0f)
|
||||
{
|
||||
Object const * parent = object.getAttachedTo();
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ void PortalPropertyTemplateNamespace::validateCoplanar(IndexedTriangleList const
|
||||
for (uint i = 3; i < numberOfVertices; ++i)
|
||||
{
|
||||
float const distance = p.computeDistanceTo(vertexList[i]);
|
||||
WARNING(abs(distance) > 0.001f, ("[%s]: portal is not planar, vertex %d is %8.6f from the plane", fileName, static_cast<int>(i), distance));
|
||||
WARNING(std::abs(distance) > 0.001f, ("[%s]: portal is not planar, vertex %d is %8.6f from the plane", fileName, static_cast<int>(i), distance));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user