merge

[lugaru.git] / Source / Objects.cpp

diff --git a/Source/Objects.cpp b/Source/Objects.cpp
index 133f65921997c01382251bcfd95b26793fecb8b6..a01fc1193598d379c0cc390c5fc7d7d53372ffec 100644 (file)
--- a/Source/Objects.cpp
+++ b/Source/Objects.cpp
@@ -31,14 +31,12 @@ extern float multiplier;
 extern float gravity;
 extern FRUSTUM frustum;
 extern Terrain terrain;
-extern float terraindetail;
 extern bool foliage;
 extern int detail;
 extern float blurness;
 extern float windvar;
 extern float playerdist;
 extern bool skyboxtexture;
-extern Sprites sprites;
 
 //Functions
 
@@ -68,8 +66,8 @@ void Objects::SphereCheckPossible(XYZ *p1,float radius)
        static int whichpatchx;
        static int whichpatchz;
 
-       whichpatchx=p1->x/(terrain.size/subdivision*terrain.scale*terraindetail);
-       whichpatchz=p1->z/(terrain.size/subdivision*terrain.scale*terraindetail);
+       whichpatchx=p1->x/(terrain.size/subdivision*terrain.scale);
+       whichpatchz=p1->z/(terrain.size/subdivision*terrain.scale);
 
        if(whichpatchx>=0&&whichpatchz>=0&&whichpatchx<subdivision&&whichpatchz<subdivision)
                if(terrain.patchobjectnum[whichpatchx][whichpatchz]>0&&terrain.patchobjectnum[whichpatchx][whichpatchz]<500)
@@ -505,17 +503,17 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float ascale){
                rotx[numobjects]=0;
                roty[numobjects]=0;
 
-               if(atype==boxtype)model[numobjects].loaddecal((char *)"/Data/Models/Box.solid",0);
-               if(atype==cooltype)model[numobjects].loaddecal((char *)"/Data/Models/Cool.solid",0);
-               if(atype==walltype)model[numobjects].loaddecal((char *)"/Data/Models/Wall.solid",0);
-               if(atype==tunneltype)model[numobjects].loaddecal((char *)"/Data/Models/Tunnel.solid",0);
-               if(atype==chimneytype)model[numobjects].loaddecal((char *)"/Data/Models/Chimney.solid",0);
-               if(atype==spiketype)model[numobjects].load((char *)"/Data/Models/Spike.solid",0);
-               if(atype==weirdtype)model[numobjects].loaddecal((char *)"/Data/Models/Weird.solid",0);
-               if(atype==rocktype)model[numobjects].loaddecal((char *)"/Data/Models/Rock.solid",0);
-               if(atype==treetrunktype)model[numobjects].load((char *)"/Data/Models/Treetrunk.solid",0);
-               if(atype==treeleavestype)model[numobjects].load((char *)"/Data/Models/Leaves.solid",0);
-               if(atype==bushtype)model[numobjects].load((char *)"/Data/Models/Bush.solid",0);
+               if(atype==boxtype)model[numobjects].loaddecal((char *)":Data:Models:Box.solid",0);
+               if(atype==cooltype)model[numobjects].loaddecal((char *)":Data:Models:Cool.solid",0);
+               if(atype==walltype)model[numobjects].loaddecal((char *)":Data:Models:Wall.solid",0);
+               if(atype==tunneltype)model[numobjects].loaddecal((char *)":Data:Models:Tunnel.solid",0);
+               if(atype==chimneytype)model[numobjects].loaddecal((char *)":Data:Models:Chimney.solid",0);
+               if(atype==spiketype)model[numobjects].load((char *)":Data:Models:Spike.solid",0);
+               if(atype==weirdtype)model[numobjects].loaddecal((char *)":Data:Models:Weird.solid",0);
+               if(atype==rocktype)model[numobjects].loaddecal((char *)":Data:Models:Rock.solid",0);
+               if(atype==treetrunktype)model[numobjects].load((char *)":Data:Models:Treetrunk.solid",0);
+               if(atype==treeleavestype)model[numobjects].load((char *)":Data:Models:Leaves.solid",0);
+               if(atype==bushtype)model[numobjects].load((char *)":Data:Models:Bush.solid",0);
 
                if(atype==boxtype)friction[numobjects]=1.5;
                if(atype==cooltype)friction[numobjects]=1.5;
@@ -531,7 +529,7 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float ascale){
                if(atype==treeleavestype)friction[numobjects]=0;
 
                if(atype==platformtype){
-                       model[numobjects].loaddecal((char *)"/Data/Models/Platform.solid",0);
+                       model[numobjects].loaddecal((char *)":Data:Models:Platform.solid",0);
                        model[numobjects].Rotate(90,0,0);
                }
 
@@ -593,17 +591,17 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float arotation2
                rotx[numobjects]=0;
                roty[numobjects]=0;
 
-               if(atype==boxtype)model[numobjects].loaddecal((char *)"/Data/Models/Box.solid",0);
-               if(atype==cooltype)model[numobjects].loaddecal((char *)"/Data/Models/Cool.solid",0);
-               if(atype==walltype)model[numobjects].loaddecal((char *)"/Data/Models/Wall.solid",0);
-               if(atype==tunneltype)model[numobjects].loaddecal((char *)"/Data/Models/Tunnel.solid",0);
-               if(atype==chimneytype)model[numobjects].loaddecal((char *)"/Data/Models/Chimney.solid",0);
-               if(atype==spiketype)model[numobjects].load((char *)"/Data/Models/Spike.solid",0);
-               if(atype==weirdtype)model[numobjects].loaddecal((char *)"/Data/Models/Weird.solid",0);
-               if(atype==rocktype)model[numobjects].loaddecal((char *)"/Data/Models/Rock.solid",0);
-               if(atype==treetrunktype)model[numobjects].load((char *)"/Data/Models/Treetrunk.solid",0);
-               if(atype==treeleavestype)model[numobjects].load((char *)"/Data/Models/Leaves.solid",0);
-               if(atype==bushtype)model[numobjects].load((char *)"/Data/Models/Bush.solid",0);
+               if(atype==boxtype)model[numobjects].loaddecal((char *)":Data:Models:Box.solid",0);
+               if(atype==cooltype)model[numobjects].loaddecal((char *)":Data:Models:Cool.solid",0);
+               if(atype==walltype)model[numobjects].loaddecal((char *)":Data:Models:Wall.solid",0);
+               if(atype==tunneltype)model[numobjects].loaddecal((char *)":Data:Models:Tunnel.solid",0);
+               if(atype==chimneytype)model[numobjects].loaddecal((char *)":Data:Models:Chimney.solid",0);
+               if(atype==spiketype)model[numobjects].load((char *)":Data:Models:Spike.solid",0);
+               if(atype==weirdtype)model[numobjects].loaddecal((char *)":Data:Models:Weird.solid",0);
+               if(atype==rocktype)model[numobjects].loaddecal((char *)":Data:Models:Rock.solid",0);
+               if(atype==treetrunktype)model[numobjects].load((char *)":Data:Models:Treetrunk.solid",0);
+               if(atype==treeleavestype)model[numobjects].load((char *)":Data:Models:Leaves.solid",0);
+               if(atype==bushtype)model[numobjects].load((char *)":Data:Models:Bush.solid",0);
 
                if(atype==boxtype)friction[numobjects]=1.5;
                if(atype==cooltype)friction[numobjects]=1.5;
@@ -621,7 +619,7 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float arotation2
                if(friction[numobjects]==1.5&&fabs(arotation2)>5)friction[numobjects]=.5;
 
                if(atype==platformtype){
-                       model[numobjects].loaddecal((char *)"/Data/Models/Platform.solid",0);
+                       model[numobjects].loaddecal((char *)":Data:Models:Platform.solid",0);
                        model[numobjects].Rotate(90,0,0);
                }
 
@@ -664,7 +662,7 @@ void Objects::DoStuff()
        XYZ spawnpoint;
        for(int i=0;i<numobjects;i++){
                /*if(type[i]==firetype){
-               sprites.MakeSprite(weaponshinesprite, position[i],position[i]*0, 1,1,1, 5, 1);
+               Sprite::MakeSprite(weaponshinesprite, position[i],position[i]*0, 1,1,1, 5, 1);
                }*/
 
                if(type[i]==firetype)onfire[i]=1;
@@ -680,7 +678,7 @@ void Objects::DoStuff()
                                        spawnpoint.z=0;
                                        spawnpoint=DoRotation(spawnpoint,0,Random()%360,0);
                                        spawnpoint+=position[i];
-                                       sprites.MakeSprite(flamesprite, spawnpoint,spawnpoint*0, 1,1,1, (.6+(float)abs(Random()%100)/200-.25)*5*scale[i], 1);
+                                       Sprite::MakeSprite(flamesprite, spawnpoint,spawnpoint*0, 1,1,1, (.6+(float)abs(Random()%100)/200-.25)*5*scale[i], 1);
                                }
                                if(type[i]==treeleavestype){
                                        spawnpoint.x=((float)(Random()%100))/80*scale[i];
@@ -688,7 +686,7 @@ void Objects::DoStuff()
                                        spawnpoint.z=0;
                                        spawnpoint=DoRotation(spawnpoint,0,Random()%360,0);
                                        spawnpoint+=position[i];
-                                       sprites.MakeSprite(flamesprite, spawnpoint,spawnpoint*0, 1,1,1, (.6+(float)abs(Random()%100)/200-.25)*6, 1);
+                                       Sprite::MakeSprite(flamesprite, spawnpoint,spawnpoint*0, 1,1,1, (.6+(float)abs(Random()%100)/200-.25)*6, 1);
                                }
                        }
 
@@ -714,8 +712,8 @@ void Objects::DoShadows()
                                        terrainpoint=position[i]+DoRotation(model[i].vertex[j]+model[i].normals[j]*.1,0,rotation[i],0);
                                        //terrainpoint.y+=model[i].boundingsphereradius;
                                        shadowed[i]=0;
-                                       patchx=terrainpoint.x/(terrain.size/subdivision*terrain.scale*terraindetail);
-                                       patchz=terrainpoint.z/(terrain.size/subdivision*terrain.scale*terraindetail);
+                                       patchx=terrainpoint.x/(terrain.size/subdivision*terrain.scale);
+                                       patchz=terrainpoint.z/(terrain.size/subdivision*terrain.scale);
                                        if(patchx>=0&&patchz>=0&&patchx<subdivision&&patchz<subdivision)
                                                if(terrain.patchobjectnum[patchx][patchz])
                                                        for(k=0;k<terrain.patchobjectnum[patchx][patchz];k++){