diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dc84ce1..de3ed783 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,21 @@ add_subdirectory(tools) if(TARGET_TYPE STREQUAL test) add_subdirectory(test) elseif(TARGET_TYPE STREQUAL game) + # Set up shared assets + + # Shaders + tool_copy(shader_textured + shared/shaders/textured.vert shaders/textured.vert + shared/shaders/textured.frag shaders/textured.frag + ) + + # Fonts + tool_copy(font_opensans + shared/fonts/opensans/OpenSans-Regular.ttf fonts/opensans/OpenSans-Regular.ttf + shared/fonts/opensans/OpenSans-Bold.ttf fonts/opensans/OpenSans-Bold.ttf + ) + + # Poker Game if(TARGET_GAME STREQUAL poker) add_compile_definitions( GAME_NAME="Penny's Poker" @@ -51,24 +66,26 @@ elseif(TARGET_TYPE STREQUAL game) ) set(DIR_CHARS poker/characters) - tool_vn_character(penny + tool_vn_character(vn_penny ${DIR_CHARS}/penny/character.xml ${DIR_CHARS}/penny.png ) - tool_vn_character(lucy + tool_vn_character(vn_lucy ${DIR_CHARS}/lucy/character.xml ${DIR_CHARS}/lucy.png ) - tool_vn_character(jenny - ${DIR_CHARS}/jenny/character.xml ${DIR_CHARS}/jenny.png + tool_vn_character(vn_julie + ${DIR_CHARS}/julie/character.xml ${DIR_CHARS}/julie.png ) - tool_vn_character(sammy + tool_vn_character(vn_sammy ${DIR_CHARS}/sammy/character.xml ${DIR_CHARS}/sammy.png ) tool_assets( - penny - lucy - jenny - sammy + shader_textured + font_opensans + vn_penny + vn_lucy + vn_julie + vn_sammy ) endif() diff --git a/assets/poker/characters/jenny/Design/bot.psd b/assets/poker/characters/jenny/Design/bot.psd new file mode 100644 index 00000000..4003f32e Binary files /dev/null and b/assets/poker/characters/jenny/Design/bot.psd differ diff --git a/assets/poker/characters/jenny/Design/screen_composition.png b/assets/poker/characters/jenny/Design/screen_composition.png index 466cfc7a..d264f533 100644 Binary files a/assets/poker/characters/jenny/Design/screen_composition.png and b/assets/poker/characters/jenny/Design/screen_composition.png differ diff --git a/assets/poker/characters/jenny/Design/sprite_base.png b/assets/poker/characters/jenny/Design/sprite_base.png index 8e6602cb..51abf9c5 100644 Binary files a/assets/poker/characters/jenny/Design/sprite_base.png and b/assets/poker/characters/jenny/Design/sprite_base.png differ diff --git a/assets/poker/characters/jenny/Design/sprite_main.png b/assets/poker/characters/jenny/Design/sprite_main.png new file mode 100644 index 00000000..28440cda Binary files /dev/null and b/assets/poker/characters/jenny/Design/sprite_main.png differ diff --git a/assets/poker/characters/jenny/concept/gdf8rgvc.jpg b/assets/poker/characters/jenny/concept/gdf8rgvc.jpg new file mode 100644 index 00000000..600d9e9d Binary files /dev/null and b/assets/poker/characters/jenny/concept/gdf8rgvc.jpg differ diff --git a/assets/poker/characters/jenny/sprites/bot.png b/assets/poker/characters/jenny/sprites/bot.png new file mode 100644 index 00000000..1a233962 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/bot.png differ diff --git a/assets/poker/characters/jenny/character.xml b/assets/poker/characters/julie/character.xml similarity index 85% rename from assets/poker/characters/jenny/character.xml rename to assets/poker/characters/julie/character.xml index 71e24032..911c9462 100644 --- a/assets/poker/characters/jenny/character.xml +++ b/assets/poker/characters/julie/character.xml @@ -1,4 +1,4 @@ - + diff --git a/assets/poker/characters/jenny/Concept/idol2s.png b/assets/poker/characters/julie/concept/idol2s.png similarity index 100% rename from assets/poker/characters/jenny/Concept/idol2s.png rename to assets/poker/characters/julie/concept/idol2s.png diff --git a/assets/poker/characters/jenny/Concept/idol_sample_b.png b/assets/poker/characters/julie/concept/idol_sample_b.png similarity index 100% rename from assets/poker/characters/jenny/Concept/idol_sample_b.png rename to assets/poker/characters/julie/concept/idol_sample_b.png diff --git a/assets/poker/characters/jenny/Concept/shotgun.png b/assets/poker/characters/julie/concept/shotgun.png similarity index 100% rename from assets/poker/characters/jenny/Concept/shotgun.png rename to assets/poker/characters/julie/concept/shotgun.png diff --git a/assets/poker/characters/jenny/Concept/test2.png b/assets/poker/characters/julie/concept/test2.png similarity index 100% rename from assets/poker/characters/jenny/Concept/test2.png rename to assets/poker/characters/julie/concept/test2.png diff --git a/assets/poker/characters/jenny/Design/idol.psd b/assets/poker/characters/julie/design/idol.psd similarity index 100% rename from assets/poker/characters/jenny/Design/idol.psd rename to assets/poker/characters/julie/design/idol.psd diff --git a/assets/poker/characters/julie/design/screen_composition.png b/assets/poker/characters/julie/design/screen_composition.png new file mode 100644 index 00000000..466cfc7a Binary files /dev/null and b/assets/poker/characters/julie/design/screen_composition.png differ diff --git a/assets/poker/characters/jenny/Design/screen_composition_b.png b/assets/poker/characters/julie/design/screen_composition_b.png similarity index 100% rename from assets/poker/characters/jenny/Design/screen_composition_b.png rename to assets/poker/characters/julie/design/screen_composition_b.png diff --git a/assets/poker/characters/julie/design/sprite_base.png b/assets/poker/characters/julie/design/sprite_base.png new file mode 100644 index 00000000..8e6602cb Binary files /dev/null and b/assets/poker/characters/julie/design/sprite_base.png differ diff --git a/assets/poker/characters/jenny/Design/sprite_main_a.png b/assets/poker/characters/julie/design/sprite_main_a.png similarity index 100% rename from assets/poker/characters/jenny/Design/sprite_main_a.png rename to assets/poker/characters/julie/design/sprite_main_a.png diff --git a/assets/poker/characters/jenny/Design/sprite_main_b.png b/assets/poker/characters/julie/design/sprite_main_b.png similarity index 100% rename from assets/poker/characters/jenny/Design/sprite_main_b.png rename to assets/poker/characters/julie/design/sprite_main_b.png diff --git a/assets/poker/characters/jenny/sprites/base.png b/assets/poker/characters/julie/sprites/base.png similarity index 100% rename from assets/poker/characters/jenny/sprites/base.png rename to assets/poker/characters/julie/sprites/base.png diff --git a/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_0.png b/assets/poker/characters/julie/sprites/eyebrows/eyebrows_0.png similarity index 100% rename from assets/poker/characters/jenny/sprites/eyebrows/eyebrows_0.png rename to assets/poker/characters/julie/sprites/eyebrows/eyebrows_0.png diff --git a/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_1.png b/assets/poker/characters/julie/sprites/eyebrows/eyebrows_1.png similarity index 100% rename from assets/poker/characters/jenny/sprites/eyebrows/eyebrows_1.png rename to assets/poker/characters/julie/sprites/eyebrows/eyebrows_1.png diff --git a/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_2.png b/assets/poker/characters/julie/sprites/eyebrows/eyebrows_2.png similarity index 100% rename from assets/poker/characters/jenny/sprites/eyebrows/eyebrows_2.png rename to assets/poker/characters/julie/sprites/eyebrows/eyebrows_2.png diff --git a/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_3.png b/assets/poker/characters/julie/sprites/eyebrows/eyebrows_3.png similarity index 100% rename from assets/poker/characters/jenny/sprites/eyebrows/eyebrows_3.png rename to assets/poker/characters/julie/sprites/eyebrows/eyebrows_3.png diff --git a/assets/poker/characters/jenny/sprites/eyes/eyes_0.png b/assets/poker/characters/julie/sprites/eyes/eyes_0.png similarity index 100% rename from assets/poker/characters/jenny/sprites/eyes/eyes_0.png rename to assets/poker/characters/julie/sprites/eyes/eyes_0.png diff --git a/assets/poker/characters/jenny/sprites/eyes/eyes_1.png b/assets/poker/characters/julie/sprites/eyes/eyes_1.png similarity index 100% rename from assets/poker/characters/jenny/sprites/eyes/eyes_1.png rename to assets/poker/characters/julie/sprites/eyes/eyes_1.png diff --git a/assets/poker/characters/jenny/sprites/eyes/eyes_2.png b/assets/poker/characters/julie/sprites/eyes/eyes_2.png similarity index 100% rename from assets/poker/characters/jenny/sprites/eyes/eyes_2.png rename to assets/poker/characters/julie/sprites/eyes/eyes_2.png diff --git a/assets/poker/characters/jenny/sprites/eyes/eyes_3.png b/assets/poker/characters/julie/sprites/eyes/eyes_3.png similarity index 100% rename from assets/poker/characters/jenny/sprites/eyes/eyes_3.png rename to assets/poker/characters/julie/sprites/eyes/eyes_3.png diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_0_0.png b/assets/poker/characters/julie/sprites/mouth/mouth_0_0.png similarity index 100% rename from assets/poker/characters/jenny/sprites/mouth/mouth_0_0.png rename to assets/poker/characters/julie/sprites/mouth/mouth_0_0.png diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_0_1.png b/assets/poker/characters/julie/sprites/mouth/mouth_0_1.png similarity index 100% rename from assets/poker/characters/jenny/sprites/mouth/mouth_0_1.png rename to assets/poker/characters/julie/sprites/mouth/mouth_0_1.png diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_0_2.png b/assets/poker/characters/julie/sprites/mouth/mouth_0_2.png similarity index 100% rename from assets/poker/characters/jenny/sprites/mouth/mouth_0_2.png rename to assets/poker/characters/julie/sprites/mouth/mouth_0_2.png diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_1_0.png b/assets/poker/characters/julie/sprites/mouth/mouth_1_0.png similarity index 100% rename from assets/poker/characters/jenny/sprites/mouth/mouth_1_0.png rename to assets/poker/characters/julie/sprites/mouth/mouth_1_0.png diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_1_1.png b/assets/poker/characters/julie/sprites/mouth/mouth_1_1.png similarity index 100% rename from assets/poker/characters/jenny/sprites/mouth/mouth_1_1.png rename to assets/poker/characters/julie/sprites/mouth/mouth_1_1.png diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_1_2.png b/assets/poker/characters/julie/sprites/mouth/mouth_1_2.png similarity index 100% rename from assets/poker/characters/jenny/sprites/mouth/mouth_1_2.png rename to assets/poker/characters/julie/sprites/mouth/mouth_1_2.png diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_2_0.png b/assets/poker/characters/julie/sprites/mouth/mouth_2_0.png similarity index 100% rename from assets/poker/characters/jenny/sprites/mouth/mouth_2_0.png rename to assets/poker/characters/julie/sprites/mouth/mouth_2_0.png diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_2_1.png b/assets/poker/characters/julie/sprites/mouth/mouth_2_1.png similarity index 100% rename from assets/poker/characters/jenny/sprites/mouth/mouth_2_1.png rename to assets/poker/characters/julie/sprites/mouth/mouth_2_1.png diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_2_2.png b/assets/poker/characters/julie/sprites/mouth/mouth_2_2.png similarity index 100% rename from assets/poker/characters/jenny/sprites/mouth/mouth_2_2.png rename to assets/poker/characters/julie/sprites/mouth/mouth_2_2.png diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_3_0.png b/assets/poker/characters/julie/sprites/mouth/mouth_3_0.png similarity index 100% rename from assets/poker/characters/jenny/sprites/mouth/mouth_3_0.png rename to assets/poker/characters/julie/sprites/mouth/mouth_3_0.png diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_3_1.png b/assets/poker/characters/julie/sprites/mouth/mouth_3_1.png similarity index 100% rename from assets/poker/characters/jenny/sprites/mouth/mouth_3_1.png rename to assets/poker/characters/julie/sprites/mouth/mouth_3_1.png diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_3_2.png b/assets/poker/characters/julie/sprites/mouth/mouth_3_2.png similarity index 100% rename from assets/poker/characters/jenny/sprites/mouth/mouth_3_2.png rename to assets/poker/characters/julie/sprites/mouth/mouth_3_2.png diff --git a/assets/poker/characters/jenny/sprites/sunglasses/sunglasses_0.png b/assets/poker/characters/julie/sprites/sunglasses/sunglasses_0.png similarity index 100% rename from assets/poker/characters/jenny/sprites/sunglasses/sunglasses_0.png rename to assets/poker/characters/julie/sprites/sunglasses/sunglasses_0.png diff --git a/assets/poker/characters/jenny/sprites/sunglasses/sunglasses_1.png b/assets/poker/characters/julie/sprites/sunglasses/sunglasses_1.png similarity index 100% rename from assets/poker/characters/jenny/sprites/sunglasses/sunglasses_1.png rename to assets/poker/characters/julie/sprites/sunglasses/sunglasses_1.png diff --git a/assets/poker/characters/lilly/concept/gdf8rgvc.bmp b/assets/poker/characters/lilly/concept/gdf8rgvc.bmp deleted file mode 100644 index 78dad2c7..00000000 Binary files a/assets/poker/characters/lilly/concept/gdf8rgvc.bmp and /dev/null differ diff --git a/src/poker/bet.h b/src/poker/bet.h index 92dad580..190b56be 100644 --- a/src/poker/bet.h +++ b/src/poker/bet.h @@ -8,7 +8,7 @@ #pragma once #include "../libs.h" #include "../util/math.h" -#include "fuck.h" +#include "common.h" #include "player.h" #include "pot.h" diff --git a/src/poker/fuck.h b/src/poker/common.h similarity index 100% rename from src/poker/fuck.h rename to src/poker/common.h diff --git a/src/poker/dealer.h b/src/poker/dealer.h index 8227eff2..f5678e31 100644 --- a/src/poker/dealer.h +++ b/src/poker/dealer.h @@ -7,7 +7,7 @@ #pragma once #include "../libs.h" -#include "fuck.h" +#include "common.h" #include "card.h" /** diff --git a/src/poker/player.h b/src/poker/player.h index 41bf128f..4ae7fe6b 100644 --- a/src/poker/player.h +++ b/src/poker/player.h @@ -8,7 +8,7 @@ #pragma once #include "../libs.h" #include "../util/flags.h" -#include "fuck.h" +#include "common.h" #include "bet.h" /** diff --git a/src/poker/poker.h b/src/poker/poker.h index dfb90926..5bd44f3d 100644 --- a/src/poker/poker.h +++ b/src/poker/poker.h @@ -8,7 +8,7 @@ #pragma once #include "../libs.h" #include "../util/flags.h" -#include "fuck.h" +#include "common.h" #include "card.h" #include "pot.h" #include "bet.h" diff --git a/src/poker/pot.h b/src/poker/pot.h index e9406ddf..255f8b86 100644 --- a/src/poker/pot.h +++ b/src/poker/pot.h @@ -8,7 +8,7 @@ #pragma once #include "../libs.h" #include "../util/array.h" -#include "fuck.h" +#include "common.h" /** * Adds a new pot to the poker game instance. diff --git a/src/poker/turn.h b/src/poker/turn.h index 2c134227..34488af4 100644 --- a/src/poker/turn.h +++ b/src/poker/turn.h @@ -8,7 +8,7 @@ #pragma once #include "../libs.h" #include "../util/math.h" -#include "fuck.h" +#include "common.h" #include "bet.h" #include "card.h" #include "winner.h" diff --git a/src/poker/winner.h b/src/poker/winner.h index d955559e..7dfee076 100644 --- a/src/poker/winner.h +++ b/src/poker/winner.h @@ -8,7 +8,7 @@ #pragma once #include "../libs.h" #include "card.h" -#include "fuck.h" +#include "common.h" #include "player.h" diff --git a/test/util/array.c b/test/util/array.c new file mode 100644 index 00000000..06e162b3 --- /dev/null +++ b/test/util/array.c @@ -0,0 +1,8 @@ +/** + * Copyright (c) 2021 Dominic Masters + * + * This software is released under the MIT License. + * https://opensource.org/licenses/MIT + */ + +#include "array.h" \ No newline at end of file diff --git a/test/util/array.h b/test/util/array.h new file mode 100644 index 00000000..f10cea09 --- /dev/null +++ b/test/util/array.h @@ -0,0 +1,12 @@ +/** + * Copyright (c) 2021 Dominic Masters + * + * This software is released under the MIT License. + * https://opensource.org/licenses/MIT + */ + +#pragma once +#include +#include + +int test_array_h(); \ No newline at end of file diff --git a/tools/file/CMakeLists.txt b/tools/file/CMakeLists.txt index 63d7caa9..9123a9f6 100644 --- a/tools/file/CMakeLists.txt +++ b/tools/file/CMakeLists.txt @@ -9,4 +9,27 @@ function(tool_assets args) DEPENDS ${ARGV} COMMENT "Compressing Assets" ) +endfunction() + +function(tool_copy target) + math(EXPR CARGSN "${ARGC} - 1") + set(LOOP_DEPENDENCIES) + + foreach(index RANGE 1 ${CARGSN} 2) + math(EXPR indexnext "${index} + 1") + set(LOOP_TARGET "item_${target}_${index}") + + LIST(GET ARGV ${index} from) + LIST(GET ARGV ${indexnext} to) + LIST(APPEND LOOP_DEPENDENCIES ${LOOP_TARGET}) + add_custom_command(OUTPUT ${LOOP_TARGET} + COMMAND ${CMAKE_COMMAND} -E copy "${ROOT_DIR}/${ASSETS_DIR}/${from}" "${ASSETS_DIR}/${to}" + COMMENT "Copying ${from} => ${to}" + ) + endforeach() + + add_custom_target(${target} + DEPENDS ${MY_LIST} + COMMENT "Copying ${FILE_NAME}" + ) endfunction() \ No newline at end of file diff --git a/tools/vn/CMakeLists.txt b/tools/vn/CMakeLists.txt index e5d52625..6cf599f2 100644 --- a/tools/vn/CMakeLists.txt +++ b/tools/vn/CMakeLists.txt @@ -6,6 +6,6 @@ function(tool_vn_character DEP_NAME IN OUT) add_custom_target(${DEP_NAME} COMMAND node ${TOOLS_DIR}/vn/character-sheet-generator.js --assets="${ASSETS_DIR}" --root="${ROOT_DIR}" --in="${IN}" --out="${OUT}" - COMMENT "Adding VN Character ${FILE_NAME}" + COMMENT "Adding VN Character ${DEP_NAME}" ) endfunction() \ No newline at end of file