Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Paul 2001-02-15 19:49:34 +00:00
parent 744c541a5a
commit c06ddfff74
4 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/DataCache.scr
View File

@ -87,6 +87,8 @@ levels/CHAPTER04_LEVEL0405.Lvl
levels/CHAPTER04_LEVEL0406.Lvl
levels/CHAPTER04_LEVEL0407.Lvl
collision/colltab.dat
actors/spongebob.a3d
actors/spongebob.tex

22
makefile.gfx
View File

@ -101,6 +101,28 @@ cleanlevels : $(foreach CHAPTER,$(LEVELS_CHAPTERS),$(foreach LEVEL,$(LEVELS_$(C
@$(ECHO) Levels cleaned
#----------------------------------------------------------------------------
# Collision data
#----------------------------------------------------------------------------
COLLISION_IN := $(TOOL_DIR)/mapedit/collision.bmp
COLLISION_OUT_DIR := $(DATA_OUT)/collision
COLLISION_OUT := $(COLLISION_OUT_DIR)/colltab.dat
collision : $(COLLISION_OUT)
cleancollision:
@$(RM) -f $(COLLISION_OUT)
@$(ECHO) Collision table cleaned
$(COLLISION_OUT) : $(COLLISION_IN)
@$(DATA_BIN_DIR)/mkcoltab $(COLLISION_IN) -o:$(COLLISION_OUT)
GRAF_DIRS_TO_MAKE += $(COLLISION_OUT_DIR)
GFX_DATA_OUT += $(COLLISION_OUT)
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
# Actors

58
source/level/layercollision.cpp
View File

@ -8,6 +8,10 @@
#include "LayerCollision.h"
#ifndef _FILEIO_HEADER_
#include "fileio\fileio.h"
#endif
/*****************************************************************************/
/*****************************************************************************/
@ -19,6 +23,8 @@ CLayerCollision::CLayerCollision(sLayerHdr *Hdr)
MapWidth=LayerHdr->Width;
MapHeight=LayerHdr->Height;
printf("COLLISION LAYER = %i %i\n",MapWidth,MapHeight);
m_collisionTable=CFileIO::loadFile(COLLISION_COLLTAB_DAT);
}
/*****************************************************************************/
@ -29,8 +35,60 @@ CLayerCollision::~CLayerCollision()
/*****************************************************************************/
void CLayerCollision::shutdown()
{
MemFree(m_collisionTable);
}
/*****************************************************************************/
int CLayerCollision::getHeightFromGround(int _x,int _y,int _maxHeight)
{
int mapX,mapY,xFraction,yFraction;
int distanceFromGround;
int colHeight;
mapX=_x>>4;
mapY=(_y>>4)*MapWidth;
xFraction=_x&0x0f;
yFraction=16-(_y&0x0f);
distanceFromGround=0;
colHeight=m_collisionTable[(Map[mapX+mapY]*16)+xFraction];if(Map[mapX+mapY])colHeight++;
if(colHeight)
{
// Inside a collision block.. find the nearest ground above this point
while(colHeight==16)
{
_y-=16;
mapY-=MapWidth;
distanceFromGround-=16;
if(distanceFromGround<=-_maxHeight)
{
return -_maxHeight;
}
colHeight=m_collisionTable[(Map[mapX+mapY]*16)+xFraction];if(Map[mapX+mapY])colHeight++;
}
distanceFromGround+=yFraction-colHeight;
}
else
{
// Not inside a collision block.. find the nearest ground below this point
while(colHeight==0)
{
_y+=16;
mapY+=MapWidth;
distanceFromGround+=16;
if(distanceFromGround>=_maxHeight)
{
return _maxHeight;
}
colHeight=m_collisionTable[(Map[mapX+mapY]*16)+xFraction];if(Map[mapX+mapY])colHeight++;
}
distanceFromGround+=yFraction-colHeight;
}
return distanceFromGround;
}
/*****************************************************************************/
#ifdef __SHOW_COLLISION__
#include "gfx\prim.h"

3
source/level/layercollision.h
View File

@ -23,6 +23,7 @@ virtual ~CLayerCollision();
virtual void shutdown();
u8 Get(int X,int Y) {return(Map[X+(Y*MapWidth)]);}
int getHeightFromGround(int _x,int _y,int _maxHeight=32);
#ifdef __SHOW_COLLISION__
void render(DVECTOR &MapPos);
@ -35,6 +36,8 @@ protected:
u8 *Map;
u8 *m_collisionTable;
};