Continue door

This commit is contained in:
Miloslav Číž 2019-10-04 21:09:10 +02:00
parent 24503fd0af
commit 8e847807a4
3 changed files with 92 additions and 25 deletions

View File

@ -43,4 +43,10 @@
*/ */
#define SFG_MOVING_WALL_SPEED 1024 #define SFG_MOVING_WALL_SPEED 1024
/**
How quickly doors open and close, in RCL_Unit per second.
*/
#define SFG_DOOR_OPEN_SPEED 2048
#endif // guard #endif // guard

100
main.c
View File

@ -88,6 +88,15 @@ void SFG_init();
#include "levels.h" #include "levels.h"
#include "assets.h" #include "assets.h"
#include "palette.h" #include "palette.h"
#include "settings.h" // will include if not included by platform
#define RCL_PIXEL_FUNCTION SFG_pixelFunc
#define RCL_TEXTURE_VERTICAL_STRETCH 0
#define RCL_CAMERA_COLL_HEIGHT_BELOW 800
#define RCL_CAMERA_COLL_HEIGHT_ABOVE 100
#include "raycastlib.h"
#define SFG_GAME_RESOLUTION_X \ #define SFG_GAME_RESOLUTION_X \
(SFG_SCREEN_RESOLUTION_X / SFG_RESOLUTION_SCALEDOWN) (SFG_SCREEN_RESOLUTION_X / SFG_RESOLUTION_SCALEDOWN)
@ -97,23 +106,30 @@ void SFG_init();
#define SFG_MS_PER_FRAME (1000 / SFG_FPS) // ms per frame with target FPS #define SFG_MS_PER_FRAME (1000 / SFG_FPS) // ms per frame with target FPS
#if SFG_MS_PER_FRAME == 0
#define SFG_MS_PER_FRAME 1
#endif
#define SFG_PLAYER_TURN_UNITS_PER_FRAME \ #define SFG_PLAYER_TURN_UNITS_PER_FRAME \
((SFG_PLAYER_TURN_SPEED * RCL_UNITS_PER_SQUARE) / (360 * SFG_FPS)) ((SFG_PLAYER_TURN_SPEED * RCL_UNITS_PER_SQUARE) / (360 * SFG_FPS))
// TODO: ^ if zero, set to 1?
#if SFG_PLAYER_TURN_UNITS_PER_FRAME == 0
#define SFG_PLAYER_TURN_UNITS_PER_FRAME 1
#endif
#define SFG_PLAYER_MOVE_UNITS_PER_FRAME \ #define SFG_PLAYER_MOVE_UNITS_PER_FRAME \
((SFG_PLAYER_MOVE_SPEED * RCL_UNITS_PER_SQUARE) / SFG_FPS) ((SFG_PLAYER_MOVE_SPEED * RCL_UNITS_PER_SQUARE) / SFG_FPS)
#if SFG_PLAYER_MOVE_UNITS_PER_FRAME == 0
#define SFG_PLAYER_MOVE_UNITS_PER_FRAME 1
#endif
#define SFG_GRAVITY_SPEED_INCREASE_PER_FRAME \ #define SFG_GRAVITY_SPEED_INCREASE_PER_FRAME \
((SFG_GRAVITY_ACCELERATION * RCL_UNITS_PER_SQUARE) / (SFG_FPS * SFG_FPS)) ((SFG_GRAVITY_ACCELERATION * RCL_UNITS_PER_SQUARE) / (SFG_FPS * SFG_FPS))
#define RCL_PIXEL_FUNCTION SFG_pixelFunc #if SFG_GRAVITY_SPEED_INCREASE_PER_FRAME == 0
#define RCL_TEXTURE_VERTICAL_STRETCH 0 #define SFG_GRAVITY_SPEED_INCREASE_PER_FRAME 1
#endif
#define RCL_CAMERA_COLL_HEIGHT_BELOW 800
#define RCL_CAMERA_COLL_HEIGHT_ABOVE 100
#include "raycastlib.h"
/** /**
Step in which walls get higher, in raycastlib units. Step in which walls get higher, in raycastlib units.
@ -200,6 +216,15 @@ typedef struct
} SFG_DoorRecord; } SFG_DoorRecord;
#define SFG_DOOR_DEFAULT_STATE 0x1f #define SFG_DOOR_DEFAULT_STATE 0x1f
#define SFG_DOOR_UP_DOWN_MASK 0x20
#define SFG_DOOR_VERTICAL_POSITION_MASK 0x1f
#define SFG_DOOR_HEIGHT_STEP (RCL_UNITS_PER_SQUARE / 0x1f)
#define SFG_DOOR_INCREMENT_PER_FRAME \
(SFG_DOOR_OPEN_SPEED / (SFG_DOOR_HEIGHT_STEP * SFG_FPS))
#if SFG_DOOR_INCREMENT_PER_FRAME == 0
#define SFG_DOOR_INCREMENT_PER_FRAME 1
#endif
#define SFG_MAX_DOORS 32 #define SFG_MAX_DOORS 32
@ -461,16 +486,36 @@ RCL_Unit SFG_floorHeightAt(int16_t x, int16_t y)
{ {
uint8_t properties; uint8_t properties;
SFG_TileDefinition tile = SFG_getMapTile(SFG_currentLevel.levelPointer,x,y,&properties); SFG_TileDefinition tile =
SFG_getMapTile(SFG_currentLevel.levelPointer,x,y,&properties);
return properties != SFG_TILE_PROPERTY_ELEVATOR ? uint8_t doorHeight = 0;
SFG_TILE_FLOOR_HEIGHT(tile) * SFG_WALL_HEIGHT_STEP :
SFG_movingWallHeight( if (properties == SFG_TILE_PROPERTY_DOOR)
{
for (uint8_t i = 0; i < SFG_currentLevel.doorRecordCount; ++i)
{
SFG_DoorRecord *door = &(SFG_currentLevel.doors[i]);
if ((door->coords[0] == x) && (door->coords[1] == y))
{
doorHeight = door->state & SFG_DOOR_VERTICAL_POSITION_MASK;
break;
}
}
}
else if (properties == SFG_TILE_PROPERTY_ELEVATOR)
{
return SFG_movingWallHeight(
SFG_TILE_FLOOR_HEIGHT(tile) * SFG_WALL_HEIGHT_STEP, SFG_TILE_FLOOR_HEIGHT(tile) * SFG_WALL_HEIGHT_STEP,
SFG_TILE_CEILING_HEIGHT(tile) * SFG_WALL_HEIGHT_STEP, SFG_TILE_CEILING_HEIGHT(tile) * SFG_WALL_HEIGHT_STEP,
SFG_getTimeMs() - SFG_currentLevel.timeStart); SFG_getTimeMs() - SFG_currentLevel.timeStart);
} }
return SFG_TILE_FLOOR_HEIGHT(tile) * SFG_WALL_HEIGHT_STEP -
doorHeight * SFG_DOOR_HEIGHT_STEP;
}
RCL_Unit SFG_ceilingHeightAt(int16_t x, int16_t y) RCL_Unit SFG_ceilingHeightAt(int16_t x, int16_t y)
{ {
uint8_t properties; uint8_t properties;
@ -686,20 +731,35 @@ void SFG_gameStep()
/* Check one door on whether a player is standing nearby. For performance /* Check one door on whether a player is standing nearby. For performance
reasons we only check one door and move to another in the next frame. */ reasons we only check one door and move to another in the next frame. */
SFG_DoorRecord door = SFG_DoorRecord *door =
SFG_currentLevel.doors[SFG_currentLevel.checkedDoorIndex]; &(SFG_currentLevel.doors[SFG_currentLevel.checkedDoorIndex]);
if ( door->state = (door->state & ~SFG_DOOR_UP_DOWN_MASK) |
(door.coords[0] >= (SFG_player.squarePosition[0] - 1)) && (
(door.coords[0] <= (SFG_player.squarePosition[0] + 1)) && ((door->coords[0] >= (SFG_player.squarePosition[0] - 1)) &&
(door.coords[1] >= (SFG_player.squarePosition[1] - 1)) && (door->coords[0] <= (SFG_player.squarePosition[0] + 1)) &&
(door.coords[1] <= (SFG_player.squarePosition[1] + 1))) (door->coords[1] >= (SFG_player.squarePosition[1] - 1)) &&
printf("%d %d\n",SFG_player.squarePosition[0],SFG_player.squarePosition[1]); (door->coords[1] <= (SFG_player.squarePosition[1] + 1))) ?
SFG_DOOR_UP_DOWN_MASK : 0x00
);
SFG_currentLevel.checkedDoorIndex++; SFG_currentLevel.checkedDoorIndex++;
if (SFG_currentLevel.checkedDoorIndex >= SFG_currentLevel.doorRecordCount) if (SFG_currentLevel.checkedDoorIndex >= SFG_currentLevel.doorRecordCount)
SFG_currentLevel.checkedDoorIndex = 0; SFG_currentLevel.checkedDoorIndex = 0;
for (uint32_t i = 0; i < SFG_currentLevel.doorRecordCount; ++i)
{
SFG_DoorRecord *door = &(SFG_currentLevel.doors[i]);
int8_t height = door->state & SFG_DOOR_VERTICAL_POSITION_MASK;
height = (door->state & SFG_DOOR_UP_DOWN_MASK) ?
RCL_min(0x1f,height + SFG_DOOR_INCREMENT_PER_FRAME) :
RCL_max(0x00,height - SFG_DOOR_INCREMENT_PER_FRAME);
door->state = (door->state & ~SFG_DOOR_VERTICAL_POSITION_MASK) | height;
}
} }
void SFG_mainLoopBody() void SFG_mainLoopBody()

View File

@ -64,7 +64,8 @@ int8_t SFG_keyPressed(uint8_t key)
case SFG_KEY_DOWN: case SFG_KEY_DOWN:
return sdlKeyboardState[SDL_SCANCODE_DOWN] || return sdlKeyboardState[SDL_SCANCODE_DOWN] ||
sdlKeyboardState[SDL_SCANCODE_S] || sdlKeyboardState[SDL_SCANCODE_S] ||
sdlKeyboardState[SDL_SCANCODE_KP_5]; sdlKeyboardState[SDL_SCANCODE_KP_5] ||
sdlKeyboardState[SDL_SCANCODE_KP_2];
break; break;
case SFG_KEY_LEFT: case SFG_KEY_LEFT: