Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history 
Fixed issue with CA_RayCastLineAngle()
Updated colandreas.inc it was an older version
  • Loading branch information
@Pottus
Pottus committed May 16, 2015
1 parent 8687a96 commit 3a7fdf8
Show file tree
Hide file tree
Showing 3 changed files with 159 additions and 17 deletions.
Binary file modified Pre Compiled/Windows/ColAndreas.dll
View file
Binary file not shown.
173 changes: 157 additions & 16 deletions Server/include/colandreas.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
////////////////////////////////////////////////////////////////////////////////

/*
Written by [uL]Pottus
Native Functions:
Add any remove building first before initializing the map
native CA_RemoveBuilding(modelid, Float:x, Float:y, Float:z, Float:radius)
Expand All @@ -13,9 +15,15 @@ native CA_Init();
Cast a line from p1 to p2 and return the point of collision
native CA_RayCastLine(Float:StartX, Float:StartY, Float:StartZ, Float:EndX, Float:EndY, Float:EndZ, &Float:x, &Float:y, &Float:z)
Cast a line that will return multiple layers of collision results (Results are unsorted in terms sequence of collisions)
native CA_RayCastMultiLine(Float:StartX, Float:StartY, Float:StartZ, Float:EndX, Float:EndY, Float:EndZ, Float:retx[], Float:rety[], Float:retz[], Float:retdist[], ModelIDs[], size = sizeof(retx));
Converts SAMP rx,ry,rz rotations to quaternion used by ColAndreas
native CA_EulerToQuat(Float:rx, Float:ry, Float:rz, &Float:x, &Float:y, &Float:z, &Float:w)
Convert quaternion to euler
native CA_QuatToEuler(Float:x, Float:y, Float:z, Float:w, Float:rx, Float:ry, Float:rz)
Create a collision object
native CA_CreateObject(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, bool:add = false)
Expand All @@ -24,15 +32,15 @@ native CA_DestroyObject(index)
Stock functions:
Create a dynamic object (Streamer) with collision in ColAndreas static
stock CA_CreateDynamicObject_SC(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, vw = -1, interior = -1, playerid = -1, Float:streamdist = 300.0, Float:drawdist = 300.0)
stock CA_CreateDynamicObjectEx_SC(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, Float:drawdistance = 0.0, Float:streamdistance = 200.0, worlds[] = { -1 }, interiors[] = { -1 }, players[] = { -1 }, maxworlds = sizeof worlds, maxinteriors = sizeof interiors, maxplayers = sizeof players)
CA_CreateDynamicObject_SC(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, vw = -1, interior = -1, playerid = -1, Float:streamdist = 300.0, Float:drawdist = 300.0)
CA_CreateDynamicObjectEx_SC(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, Float:drawdistance = 0.0, Float:streamdistance = 200.0, worlds[] = { -1 }, interiors[] = { -1 }, players[] = { -1 }, maxworlds = sizeof worlds, maxinteriors = sizeof interiors, maxplayers = sizeof players)
Create a object with collision in ColAndreas static
CA_CreateObject_SC(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, Float:drawdistance = 300.0)
Create a dynamic object (Streamer) with collision in ColAndreas dynamic
CA_CreateDynamicObject_DC(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, vw = -1, interior = -1, playerid = -1, Float:streamdist = 300.0, Float:drawdist = 300.0)
stock CreateDynamicObjectEx_DC(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, Float:drawdistance = 0.0, Float:streamdistance = 200.0, worlds[] = { -1 }, interiors[] = { -1 }, players[] = { -1 }, maxworlds = sizeof worlds, maxinteriors = sizeof interiors, maxplayers = sizeof players)
CA_CreateDynamicObjectEx_DC(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, Float:drawdistance = 0.0, Float:streamdistance = 200.0, worlds[] = { -1 }, interiors[] = { -1 }, players[] = { -1 }, maxworlds = sizeof worlds, maxinteriors = sizeof interiors, maxplayers = sizeof players)
Create a object with collision in ColAndreas dynamic
CA_CreateObject_DC(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, Float:drawdistance = 300.0)
Expand All @@ -46,6 +54,24 @@ CA_DestroyAllObjects_DC()
MapAndreas replacement function
CA_FindZ_For2DCoord(Float:x, Float:y, &Float:z)
Checks if a player is standing on any surface (prevent animation exploit when falling)
CA_IsOnSurface(playerid, Float:tolerance=1.5)
Removes all barries this function only works BEFORE using CA_Init()
CA_RemoveBarriers()
Checks if a player is in the water depth returns the lowest collision point found playerdepth returns
how deep the player is below the surface
CA_IsPlayerInWater(playerid, &Float:depth, &Float:playerdepth)
Checks if a player is near water (returns 0 if they are actually in the water) distance is the radius to check
Height is how high above the water to detect
CA_IsNearWater(playerid, Float:dist=3.0, Float:height=3.0)
// Check if a player is blocked by a wall
CA_IsBlocked(playerid, Float:dist=1.5, Float:height=0.5)
Notes:
Recommended loading order
Expand All @@ -57,35 +83,46 @@ There is currently no support for virtual worlds / interior or per player with s
*/

// Used for other scripts to check if ColAndreas is being used
#define COLANDREAS

// Natives
native CA_Init();
/*
native CA_RemoveBuilding(modelid, Float:x, Float:y, Float:z, Float:radius);
native CA_RayCastLine(Float:StartX, Float:StartY, Float:StartZ, Float:EndX, Float:EndY, Float:EndZ, &Float:x, &Float:y, &Float:z);
native CA_RayCastMultiLine(handle, Float:StartX, Float:StartY, Float:StartZ, Float:EndX, Float:EndY, Float:EndZ);
native CA_RayCastMultiLine(Float:StartX, Float:StartY, Float:StartZ, Float:EndX, Float:EndY, Float:EndZ, Float:retx[], Float:rety[], Float:retz[], Float:retdist[], ModelIDs[], size = sizeof(retx));
native CA_RayCastLineAngle(Float:StartX, Float:StartY, Float:StartZ, Float:EndX, Float:EndY, Float:EndZ, &Float:x, &Float:y, &Float:z, &Float:rx, &Float:ry, &Float:rz);
native CA_RayCastReflectionVector(Float:startx, Float:starty, Float:startz, Float:endx, Float:endy, Float:endz, &Float:x, &Float:y, &Float:z, &Float:nx, &Float:ny, &Float:nz);
native CA_RayCastLineNormal(Float:startx, Float:starty, Float:startz, Float:endx, Float:endy, Float:endz, &Float:x, &Float:y, &Float:z, &Float:nx, &Float:ny, &Float:nz);
native CA_EulerToQuat(Float:rx, Float:ry, Float:rz, &Float:x, &Float:y, &Float:z, &Float:w);
native CA_QuatToEuler(Float:x, Float:y, Float:z, Float:w, &Float:rx, &Float:ry, &Float:rz);
native CA_GetModelBoundingSphere(modelid, &Float:offx, &Float:offy, &Float:offz, &Float:radius);

// Extended raycast function returns internal pointer of mapobject class instead of modelid
native CA_RayCastLineEx(Float:StartX, Float:StartY, Float:StartZ, Float:EndX, Float:EndY, Float:EndZ, &Float:x, &Float:y, &Float:z, &Float:rx, &Float:ry, &Float:rz, &Float:rw, &Float:cx, &Float:cy, &Float:cz);
native CA_RayCastLineAngleEx(Float:StartX, Float:StartY, Float:StartZ, Float:EndX, Float:EndY, Float:EndZ, &Float:x, &Float:y, &Float:z, &Float:rx, &Float:ry, &Float:rz, &Float:ocx, &Float:ocy, &Float:ocz, &Float:orx, &Float:ory, &Float:orz);

// Used internally
native CA_CreateObject(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, bool:add = false);
native CA_DestroyObject(index);
native CA_SetObjectPos(index, Float:x, Float:y, Float:z);
native CA_SetObjectRot(index, Float:rx, Float:ry, Float:rz);
*/
// Callbacks
forward CA_OnRayCastMultiLine(handle, Float:ResultsX[], Float:ResultsY[], Float:ResultsZ[], ResultSize);

// ColAndreas currently supports 50000 user collision objects (Lower to acommodate muliple scripts)
// ColAndreas currently supports 50000 user collision objects (This can be raised as needed)
#define MAX_CA_OBJECTS 10000

// Water object ID
#define WATER_OBJECT 19999
#define WATER_OBJECT 20000

// Object types (Player objects are supported as dynamic only)
#define OBJECT_TYPE_OBJECT 0
#define OBJECT_TYPE_DYNAMIC 1


#if !defined INFINITY
#define INFINITY (Float:0x7F800000)
#endif

#if defined _Y_ITERATE_LOCAL_VERSION
static stock Iterator:CA_Objects<MAX_CA_OBJECTS>;
#endif
Expand All @@ -103,7 +140,6 @@ enum CAOBJECTINFO

static stock CA_ObjectList[MAX_CA_OBJECTS][CAOBJECTINFO];


// Static collision object functions (The index is not returned these can not be deleted!)
stock CA_CreateDynamicObjectEx_SC(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, Float:drawdistance = 0.0, Float:streamdistance = 200.0, worlds[] = { -1 }, interiors[] = { -1 }, players[] = { -1 }, maxworlds = sizeof worlds, maxinteriors = sizeof interiors, maxplayers = sizeof players)
{
Expand Down Expand Up @@ -182,7 +218,7 @@ stock CA_CreateDynamicObject_DC(modelid, Float:x, Float:y, Float:z, Float:rx, Fl
CA_ObjectList[index][ObjectUsed] = true;
#endif
CA_ObjectList[index][ObjectID] = CreateDynamicObject(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, vw, interior, playerid, streamdist, drawdist);
CA_ObjectList[index][ColdAndreadsID] = index = CA_CreateObject(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, true);
CA_ObjectList[index][ColdAndreadsID] = CA_CreateObject(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, true);
CA_ObjectList[index][ObjectType] = OBJECT_TYPE_DYNAMIC;
}
return index;
Expand Down Expand Up @@ -212,7 +248,7 @@ stock CA_CreateObject_DC(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry,
CA_ObjectList[index][ObjectUsed] = true;
#endif
CA_ObjectList[index][ObjectID] = CreateObject(modelid, x, y, z, rx, ry, rz, drawdistance);
CA_ObjectList[index][ColdAndreadsID] = index = CA_CreateObject(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, true);
CA_ObjectList[index][ColdAndreadsID] = CA_CreateObject(modelid, Float:x, Float:y, Float:z, Float:rx, Float:ry, Float:rz, true);
CA_ObjectList[index][ObjectType] = OBJECT_TYPE_OBJECT;
}
return index;
Expand Down Expand Up @@ -306,7 +342,7 @@ stock CA_SetObjectRot_DC(index, Float:rx, Float:ry, Float:rz)
}

// Destroy all objects
CA_DestroyAllObjects_DC()
stock CA_DestroyAllObjects_DC()
{
#if defined _Y_ITERATE_LOCAL_VERSION
foreach(new i : CA_Objects)
Expand All @@ -332,11 +368,116 @@ stock CA_FindZ_For2DCoord(Float:x, Float:y, &Float:z)
return 0;
}

// Check if a player is standing on a surface
stock CA_IsPlayerOnSurface(playerid, Float:tolerance=1.5)
{
new Float:x, Float:y, Float:z;
GetPlayerPos(playerid, x, y, z);

// Check if player is actually on the ground
if(!CA_RayCastLine(x, y, z, x, y, z-tolerance, x, y, z))
return 0;
return 1;
}

// remove all barries
stock CA_RemoveBarriers()
{
static const BarrierIDS[] = {
16439, 16438, 16437, 16436, 4527, 4526, 4525, 4524,
4523, 4517, 4516, 4515, 4514, 4513, 4512, 4511, 4510,
4509, 4508, 4507, 4506, 4505, 4504, 1662
};

for(new i = 0; i < sizeof(BarrierIDS); i++)
CA_RemoveBuilding(BarrierIDS[i], 0.0, 0.0, 0.0, 3000.0);

return 1;
}

// Checks if player is in the water
stock CA_IsPlayerInWater(playerid, &Float:depth, &Float:playerdepth)
{
new Float:x, Float:y, Float:z, Float:retx[10], Float:rety[10], Float:retz[10], Float: retdist[10], modelids[10];
GetPlayerPos(playerid, x, y, z);
new collisions = CA_RayCastMultiLine(x, y, z+1000.0, x, y, z-1000.0, retx, rety, retz, retdist, modelids, 10);
if(collisions)
{
for(new i = 0; i < collisions; i++)
{
if(modelids[i] == WATER_OBJECT)
{
depth = INFINITY;

for(new j = 0; j < collisions; j++)
{
if(retz[j] < depth)
depth = retz[j];
}

depth = retz[i] - depth;
if(depth < 0.001 && depth > -0.001)
depth = 100.0;
playerdepth = retz[i] - z;

if(playerdepth < -2.0)
return 0;

return 1;
}
}
}
return 0;
}

// Check if player is near water
stock CA_IsPlayerNearWater(playerid, Float:dist=3.0, Float:height=3.0)
{
new Float:x, Float:y, Float:z, Float:tmp;
GetPlayerPos(playerid, x, y, z);
if(CA_RayCastLine(x+dist, y, z, x+dist, y, z-height, tmp, tmp, tmp) == WATER_OBJECT ||
CA_RayCastLine(x-dist, y, z, x-dist, y, z-height, tmp, tmp, tmp) == WATER_OBJECT ||
CA_RayCastLine(x, y+dist, z, x, y+dist, z-height, tmp, tmp, tmp) == WATER_OBJECT ||
CA_RayCastLine(x, y-dist, z, x, y-dist, z-height, tmp, tmp, tmp) == WATER_OBJECT ||
CA_RayCastLine(x+dist, y+dist, z, x+dist, y+dist, z-height, tmp, tmp, tmp) == WATER_OBJECT ||
CA_RayCastLine(x-dist, y-dist, z, x-dist, y-dist, z-height, tmp, tmp, tmp) == WATER_OBJECT ||
CA_RayCastLine(x-dist, y+dist, z, x-dist, y+dist, z-height, tmp, tmp, tmp) == WATER_OBJECT ||
CA_RayCastLine(x+dist, y-dist, z, x+dist, y-dist, z-height, tmp, tmp, tmp) == WATER_OBJECT)
return 1;
return 0;
}

// Checks if a player is blocked by a wall
stock CA_IsPlayerBlocked(playerid, Float:dist=1.5, Float:height=0.5)
{
new Float:x, Float:y, Float:z, Float:endx, Float:endy, Float:fa;
GetPlayerPos(playerid, x, y, z);
z -= 1.0 + height;
GetPlayerFacingAngle(playerid, fa);

endx = (x + dist * floatsin(-fa,degrees));
endy = (y + dist * floatcos(-fa,degrees));
if(CA_RayCastLine(x, y, z, endx, endy, z, x, y, z))
return 1;
return 0;
}

stock Float:CA_GetRoomHeight(Float:x, Float:y, Float:z)
{
new Float:fx, Float:fy, Float:fz, Float:cx, Float:cy, Float:cz;
if(CA_RayCastLine(x, y, z, x, y, z-1000.0, fx, fy, fz))
{
if(CA_RayCastLine(x, y, z, x, y, z+1000.0, cx, cy, cz))
return floatsqroot(((fx-cx)*(fx-cx))+((fy-cy)*(fy-cy))+((fz-cz)*(fz-cz)));
}
return 0.0;
}


// Hooked functions
public OnFilterScriptExit()
{
// CA_DestroyAllObjects_DC();
CA_DestroyAllObjects_DC();
if (funcidx("CA_OnFilterScriptExit") != -1)
{
return CallLocalFunction("CA_OnFilterScriptExit", "");
Expand All @@ -356,7 +497,7 @@ forward CA_OnFilterScriptExit();

public OnGameModeExit()
{
// CA_DestroyAllObjects_DC();
CA_DestroyAllObjects_DC();
if (funcidx("CA_OnGameModeExit") != -1)
{
return CallLocalFunction("CA_OnGameModeExit", "");
Expand Down
3 changes: 2 additions & 1 deletion src/Natives.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,13 @@ cell AMX_NATIVE_CALL ColAndreasNatives::CA_RayCastLineAngle(AMX *amx, cell *para

if (collisionWorld->performRayTestAngle(Start, End, Result, RX, RY, RZ, model))
{
//Get our adderesses for the last 5
//Get our adderesses for the last 6
amx_GetAddr(amx, params[7], &addr[0]);
amx_GetAddr(amx, params[8], &addr[1]);
amx_GetAddr(amx, params[9], &addr[2]);
amx_GetAddr(amx, params[10], &addr[3]);
amx_GetAddr(amx, params[11], &addr[4]);
amx_GetAddr(amx, params[12], &addr[5]);

*addr[0] = amx_ftoc(Result.getX());
*addr[1] = amx_ftoc(Result.getY());
Expand Down

0 comments on commit 3a7fdf8

Please sign in to comment.