Dungeons game:

new loading screen
new HUD
performance improvement
movement speed increased

git-svn-id: svn://kolibrios.org@5480 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Anton_K 2015-02-26 21:37:43 +00:00
parent 4d2530a10e
commit 5f127d5ecf
6 changed files with 37 additions and 49 deletions

View File

@ -64,7 +64,7 @@ struct akode.TextureDesc
ImageDataPtr dd ?
HasMagicPink db ? ; boolean
TileWalls db ? ; boolean
TileWalls db ? ; boolean, not supported yet
Usage db ? ; AKODE_TEXTURE_USAGE
VirtualScale db ? ; AKODE_VIRTUAL_SCALE_MODE, not supported yet
VirtualSize akode.Size ; (0, 0) for original size, not supported yet

View File

@ -79,6 +79,8 @@ end if
test eax, eax
jz .exit_fail_akode_init
stdcall akode.set_movement_speed, MOVEMENT_SPEED, 90
mcall 68, 12 ; alloc ecx bytes for image buffer
test eax, eax
jz .exit_fail_alloc

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 259 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 47 KiB

View File

@ -15,57 +15,41 @@
; VirtualSize akode.Size ; (0, 0) for original size, not supported yet
;ends
struc TextureImage usage*, filepath*, magic_pink=0
{
.ImagePath db 'Resources/Textures/', filepath, 0
. akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, .ImagePath, 0, magic_pink, 0, usage
}
struc TextureColor color*
{
. akode.TextureDesc AKODE_TEXTURE_TYPE.COLOR, color, 0, 0, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
}
align 4
textures:
.GreenStone1 akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.GreenStone1, 0, 0, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
.GreenStone2 akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.GreenStone2, 0, 0, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
.GreenStone1 TextureImage AKODE_TEXTURE_USAGE.ENVIRONMENT, 'Environment/GreenStone1.jpg'
.GreenStone2 TextureImage AKODE_TEXTURE_USAGE.ENVIRONMENT, 'Environment/GreenStone2.jpg'
.YellowStone1 akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.YellowStone1, 0, 0, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
.RedStone1 akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.RedStone1, 0, 0, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
.YellowStone1 TextureImage AKODE_TEXTURE_USAGE.ENVIRONMENT, 'Environment/YellowStone1.jpg'
.RedStone1 TextureImage AKODE_TEXTURE_USAGE.ENVIRONMENT, 'Environment/RedStone1.jpg'
.CrazyWoodDoor akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.CrazyWoodDoor, 0, 1, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
.IronDoor akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.IronDoor, 0, 0, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
.CrazyWoodDoor TextureImage AKODE_TEXTURE_USAGE.ENVIRONMENT, 'Environment/CrazyWoodDoor.png', 1
.IronDoor TextureImage AKODE_TEXTURE_USAGE.ENVIRONMENT, 'Environment/IronDoor.jpg'
.RedLeverUp akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.RedLeverUp, 0, 1, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
.RedLeverDown akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.RedLeverDown, 0, 1, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
.RedLeverUp TextureImage AKODE_TEXTURE_USAGE.ENVIRONMENT, 'Environment/RedLeverUp.png', 1
.RedLeverDown TextureImage AKODE_TEXTURE_USAGE.ENVIRONMENT, 'Environment/RedLeverDown.png', 1
.PortalFloor akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.PortalFloor, 0, 0, 0, AKODE_TEXTURE_USAGE.ENVIRONMENT
.PortalFloor TextureImage AKODE_TEXTURE_USAGE.ENVIRONMENT, 'Environment/Portal.jpg'
.Chest akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.Chest, 0, 1, 0, AKODE_TEXTURE_USAGE.OBJECT
.Chest TextureImage AKODE_TEXTURE_USAGE.OBJECT, 'Objects/Chest.png', 1
.Column1 akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.Column1, 0, 1, 0, AKODE_TEXTURE_USAGE.OBJECT
.Column2 akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.Column2, 0, 1, 0, AKODE_TEXTURE_USAGE.OBJECT
.Column3 akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.Column3, 0, 1, 0, AKODE_TEXTURE_USAGE.OBJECT
.Column4 akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.Column4, 0, 1, 0, AKODE_TEXTURE_USAGE.OBJECT
.Column1 TextureImage AKODE_TEXTURE_USAGE.OBJECT, 'Objects/Column1.png', 1
.Column2 TextureImage AKODE_TEXTURE_USAGE.OBJECT, 'Objects/Column2.png', 1
.Column3 TextureImage AKODE_TEXTURE_USAGE.OBJECT, 'Objects/Column3.png', 1
.Column4 TextureImage AKODE_TEXTURE_USAGE.OBJECT, 'Objects/Column4.png', 1
.Ogre akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.Ogre, 0, 1, 0, AKODE_TEXTURE_USAGE.OBJECT
.Ogre TextureImage AKODE_TEXTURE_USAGE.OBJECT, 'Objects/Ogre.png', 1
.Portal akode.TextureDesc AKODE_TEXTURE_TYPE.IMAGE, texture_files.Portal, 0, 1, 0, AKODE_TEXTURE_USAGE.OBJECT
texture_files:
.GreenStone1 db 'Resources/Textures/Environment/GreenStone1.jpg', 0
.GreenStone2 db 'Resources/Textures/Environment/GreenStone2.jpg', 0
.YellowStone1 db 'Resources/Textures/Environment/YellowStone1.jpg', 0
.RedStone1 db 'Resources/Textures/Environment/RedStone1.jpg', 0
.CrazyWoodDoor db 'Resources/Textures/Environment/CrazyWoodDoor.png', 0
.IronDoor db 'Resources/Textures/Environment/IronDoor.jpg', 0
.RedLeverUp db 'Resources/Textures/Environment/RedLeverUp.png', 0
.RedLeverDown db 'Resources/Textures/Environment/RedLeverDown.png', 0
.PortalFloor db 'Resources/Textures/Environment/Portal.jpg', 0
.Chest db 'Resources/Textures/Objects/Chest.png', 0
.Column1 db 'Resources/Textures/Objects/Column1.png', 0
.Column2 db 'Resources/Textures/Objects/Column2.png', 0
.Column3 db 'Resources/Textures/Objects/Column3.png', 0
.Column4 db 'Resources/Textures/Objects/Column4.png', 0
.Ogre db 'Resources/Textures/Objects/Ogre.png', 0
.Portal db 'Resources/Textures/Objects/Portal.png', 0
.Portal TextureImage AKODE_TEXTURE_USAGE.OBJECT, 'Objects/Portal.png', 1

View File

@ -22,6 +22,8 @@ FULLSCREEN = 0
FSAA = 0
DISABLE_SHADING = 0
MOVEMENT_SPEED = BLOCK_BASE_SIZE + BLOCK_BASE_SIZE / 4
FIELD_OF_VIEW = 60
BLOCK_BASE_SIZE = 512
BLOCK_HEIGHT = 512
@ -39,7 +41,7 @@ OBJECT_IMAGE_HEIGHT = 40
GAME_MESSAGE_X = 150 + 15
GAME_MESSAGE_Y = 15 + 15
GAME_MESSAGE_COLOR = 000000h
GAME_MESSAGE_COLOR = 0E4E2ADh
if FULLSCREEN
;MAIN_WINDOW_X = 0
@ -49,10 +51,10 @@ if FULLSCREEN
MAIN_WINDOW_STYLE = (01000001b) shl 24
MAIN_WINDOW_STYLE2 = 1 shl 24
else
MAIN_WINDOW_X = 150
MAIN_WINDOW_Y = 150
MAIN_WINDOW_WIDTH = 960
MAIN_WINDOW_HEIGHT = 720
MAIN_WINDOW_X = 20
MAIN_WINDOW_Y = 20
MAIN_WINDOW_WIDTH = 960 ; client area width
MAIN_WINDOW_HEIGHT = 712 ; client area height
MAIN_WINDOW_STYLE = (01110100b) shl 24
MAIN_WINDOW_STYLE2 = 0
end if