josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed compile on win

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Rat
2010-06-05 13:30:02 +02:00
parent eeec7959e3
commit e81b40a099
3 changed files with 24 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/vmap/VMapManager2.cpp
+2 -2
View File
@@ -56,7 +56,7 @@ namespace VMAP
Vector3 VMapManager2::convertPositionToInternalRep(float x, float y, float z) const Vector3 VMapManager2::convertPositionToInternalRep(float x, float y, float z) const
{ {
Vector3 pos; Vector3 pos;
const float mid = 0.5 * 64.0 * 533.33333333; const float mid = 0.5 * 64.0 * 533.33333333f;
pos.x = mid - x; pos.x = mid - x;
pos.y = mid - y; pos.y = mid - y;
pos.z = z; pos.z = z;
@@ -69,7 +69,7 @@ namespace VMAP
Vector3 VMapManager2::convertPositionToMangosRep(float x, float y, float z) const Vector3 VMapManager2::convertPositionToMangosRep(float x, float y, float z) const
{ {
Vector3 pos; Vector3 pos;
const float mid = 0.5 * 64.0 * 533.33333333; const float mid = 0.5 * 64.0 * 533.33333333f;
pos.x = mid - x; pos.x = mid - x;
pos.y = mid - y; pos.y = mid - y;
pos.z = z; pos.z = z;
win/VC90/g3dlite.vcproj
+4
View File
@@ -464,6 +464,10 @@
RelativePath="..\..\dep\src\g3dlite\Vector4.cpp" RelativePath="..\..\dep\src\g3dlite\Vector4.cpp"
> >
</File> </File>
<File
RelativePath="..\..\dep\src\g3dlite\RegistryUtil.cpp"
>
</File>
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>
win/VC90/shared.vcproj
+17 -53
View File
@@ -565,31 +565,15 @@
Name="vmaps" Name="vmaps"
> >
<File <File
RelativePath="..\..\src\shared\vmap\AABSPTree.h" RelativePath="..\..\src\shared\vmap\BIH.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\shared\vmap\BaseModel.cpp" RelativePath="..\..\src\shared\vmap\BIH.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\shared\vmap\BaseModel.h" RelativePath="..\..\src\shared\vmap\CMakeLists.txt"
>
</File>
<File
RelativePath="..\..\src\shared\vmap\CoordModelMapping.cpp"
>
</File>
<File
RelativePath="..\..\src\shared\vmap\CoordModelMapping.h"
>
</File>
<File
RelativePath="..\..\src\shared\vmap\DebugCmdLogger.cpp"
>
</File>
<File
RelativePath="..\..\src\shared\vmap\DebugCmdLogger.h"
> >
</File> </File>
<File <File
@@ -597,39 +581,19 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\shared\vmap\ManagedModelContainer.cpp" RelativePath="..\..\src\shared\vmap\MapTree.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\shared\vmap\ManagedModelContainer.h" RelativePath="..\..\src\shared\vmap\MapTree.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\shared\vmap\ModelContainer.cpp" RelativePath="..\..\src\shared\vmap\ModelInstance.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\shared\vmap\ModelContainer.h" RelativePath="..\..\src\shared\vmap\ModelInstance.h"
>
</File>
<File
RelativePath="..\..\src\shared\vmap\NodeValueAccess.h"
>
</File>
<File
RelativePath="..\..\src\shared\vmap\ShortBox.h"
>
</File>
<File
RelativePath="..\..\src\shared\vmap\ShortVector.h"
>
</File>
<File
RelativePath="..\..\src\shared\vmap\SubModel.cpp"
>
</File>
<File
RelativePath="..\..\src\shared\vmap\SubModel.h"
> >
</File> </File>
<File <File
@@ -640,14 +604,6 @@
RelativePath="..\..\src\shared\vmap\TileAssembler.h" RelativePath="..\..\src\shared\vmap\TileAssembler.h"
> >
</File> </File>
<File
RelativePath="..\..\src\shared\vmap\TreeNode.cpp"
>
</File>
<File
RelativePath="..\..\src\shared\vmap\TreeNode.h"
>
</File>
<File <File
RelativePath="..\..\src\shared\vmap\VMapDefinitions.h" RelativePath="..\..\src\shared\vmap\VMapDefinitions.h"
> >
@@ -661,17 +617,25 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\shared\vmap\VMapManager.cpp" RelativePath="..\..\src\shared\vmap\VMapManager2.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\shared\vmap\VMapManager.h" RelativePath="..\..\src\shared\vmap\VMapManager2.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\shared\vmap\VMapTools.h" RelativePath="..\..\src\shared\vmap\VMapTools.h"
> >
</File> </File>
<File
RelativePath="..\..\src\shared\vmap\WorldModel.cpp"
>
</File>
<File
RelativePath="..\..\src\shared\vmap\WorldModel.h"
>
</File>
</Filter> </Filter>
<File <File
RelativePath="..\..\src\shared\Common.cpp" RelativePath="..\..\src\shared\Common.cpp"