doylet/Dengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load terrain image into game

Browse Source
This commit is contained in:
Doyle Thai 2016-08-27 03:37:56 +10:00
parent aa8590d585
commit 4c0c2808ca
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/WorldTraveller.c
View File

@ -458,7 +458,17 @@ INTERNAL void parseXmlTreeToGame(AssetManager *assetManager, MemoryArena *arena,
common_strncat(imagePath, dataDir, common_strlen(dataDir)); common_strncat(imagePath, dataDir, common_strlen(dataDir));
common_strncat(imagePath, imageName, common_strlen(imageName)); common_strncat(imagePath, imageName, common_strlen(imageName));
asset_loadTextureImage(assetManager, imagePath, texlist_claude); // TODO(doyle): Fixme proper loading of texture into right slot
if (common_strcmp(imageName, "ClaudeSprite.png") == 0)
{
asset_loadTextureImage(assetManager, imagePath,
texlist_claude);
}
else
{
asset_loadTextureImage(assetManager, imagePath,
texlist_terrain);
}
atlasEntry->key = PLATFORM_MEM_ALLOC( atlasEntry->key = PLATFORM_MEM_ALLOC(
arena, common_strlen(imageName) + 1, char); arena, common_strlen(imageName) + 1, char);
@ -680,6 +690,14 @@ INTERNAL void assetInit(GameState *state)
/* Free data */ /* Free data */
freeXmlData(arena, xmlTokens, numTokens, xmlTree); freeXmlData(arena, xmlTokens, numTokens, xmlTree);
platform_closeFileRead(arena, &terrainXml); platform_closeFileRead(arena, &terrainXml);
TexAtlas *terrainAtlas = asset_getTexAtlas(assetManager, "terrain.png");
i32 numSubTextures = 1;
f32 duration = 1.0f;
char *grassTerrain[1] = {"grass.png"};
asset_addAnimation(assetManager, arena, "terrainGrass", terrainAtlas,
grassTerrain, numSubTextures, duration);
} }
PlatformFileRead claudeXml = {0}; PlatformFileRead claudeXml = {0};
@ -821,9 +839,8 @@ INTERNAL void entityInit(GameState *state, v2 windowSize)
CAST(f32) state->tileSize)); CAST(f32) state->tileSize));
world->uniqueIdAccumulator = 0; world->uniqueIdAccumulator = 0;
#if 0 #if 1
TexAtlas *const atlas = TexAtlas *const atlas = asset_getTexAtlas(assetManager, "terrain.png");
asset_getTextureAtlas(assetManager, world->texType);
for (i32 y = 0; y < 1; y++) for (i32 y = 0; y < 1; y++)
{ {
@ -844,8 +861,8 @@ INTERNAL void entityInit(GameState *state, v2 windowSize)
Entity *tile = entity_add(arena, world, pos, size, type, dir, Entity *tile = entity_add(arena, world, pos, size, type, dir,
tex, collides); tex, collides);
entity_addAnim(assetManager, tile, animlist_terrain); entity_addAnim(assetManager, tile, "terrainGrass");
tile->currAnimId = animlist_terrain; entity_setActiveAnim(tile, "terrainGrass");
} }
} }
#endif #endif
@ -1020,7 +1037,7 @@ void worldTraveller_gameInit(GameState *state, v2 windowSize)
state->state = state_active; state->state = state_active;
state->currWorldIndex = 0; state->currWorldIndex = 0;
state->tileSize = 64; state->tileSize = 70;
state->uiState.uniqueId = 1; state->uiState.uniqueId = 1;
state->uiState.keyEntered = keycode_null; state->uiState.keyEntered = keycode_null;