YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moving some assets around

Browse Source
This commit is contained in:
Dominic Masters
2023-06-20 10:54:15 -07:00
parent 0b3bae6e6c
commit e2e4732938
14 changed files with 76 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dawn/CMakeLists.txt
View File

@ -43,7 +43,4 @@ target_compile_definitions(${DAWN_TARGET_NAME}
PUBLIC
${DAWN_SHARED_DEFINITIONS}
DAWN_DEBUG_BUILD=${DAWN_DEBUG_BUILD}
)
# Common Prefabs
tool_prefab("prefabs/ui/debug/FPSLabel.xml")
)

27
src/dawn/display/Tileset.cpp
View File

@ -18,6 +18,33 @@ TilesetGrid::TilesetGrid() {
}
TilesetGrid::TilesetGrid(
Texture *texture,
int32_t columns,
int32_t rows
) : TilesetGrid(
columns, rows,
texture->getWidth(), texture->getHeight(),
0, 0,
0, 0
) {
}
TilesetGrid::TilesetGrid(
Texture &texture,
int32_t columns,
int32_t rows
) : TilesetGrid(
columns, rows,
texture.getWidth(), texture.getHeight(),
0, 0,
0, 0
) {
}
TilesetGrid::TilesetGrid(
int32_t columns,
int32_t rows,

19
src/dawn/display/Tileset.hpp
View File

@ -6,6 +6,7 @@
#pragma once
#include "dawnlibs.hpp"
#include "assert/assert.hpp"
#include "display/Texture.hpp"
namespace Dawn {
struct Tile {
@ -53,6 +54,24 @@ namespace Dawn {
* Constructs a new Tileset Grid.
*/
TilesetGrid();
/**
* Constructs a new Tileset Grid from a texture.
*
* @param texture Texture to use.
* @param columns Columns in the grid.
* @param rows Rows in the grid.
*/
TilesetGrid(Texture *texture, int32_t columns, int32_t rows);
/**
* Constructs a new Tileset Grid from a texture.
*
* @param texture Texture to use.
* @param columns Columns in the grid.
* @param rows Rows in the grid.
*/
TilesetGrid(Texture &texture, int32_t columns, int32_t rows);
/**
* Constructs a new Tileset Grid.

38
src/dawnliminal/CMakeLists.txt
View File

@ -17,39 +17,5 @@ add_subdirectory(game)
add_subdirectory(save)
# Assets
set(LIMINAL_ASSETS_DIR ${DAWN_ASSETS_DIR}/games/liminal)
set(LIMINIAL_CHARACTER_SCALE 0.2)
tool_texture(texture_eth_faces_day
FILE="${LIMINAL_ASSETS_DIR}/textures/eth/faces_day.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_eth_faces_night
FILE="${LIMINAL_ASSETS_DIR}/textures/eth/faces_night.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_eth_poses_day
FILE="${LIMINAL_ASSETS_DIR}/textures/eth/poses_day.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_eth_poses_night
FILE="${LIMINAL_ASSETS_DIR}/textures/eth/test.png"
SCALE=${LIMINIAL_CHARACTER_SCALE}
)
tool_texture(texture_border
FILE=${LIMINAL_ASSETS_DIR}/textures/texture_test.png
)
tool_truetype(font_main
REGULAR=${LIMINAL_ASSETS_DIR}/fonts/Ysabeau-Medium.ttf
BOLD=${LIMINAL_ASSETS_DIR}/fonts/Ysabeau-SemiBold.ttf
ITALICS=${LIMINAL_ASSETS_DIR}/fonts/Ysabeau-MediumItalic.ttf
BOLD_ITALICS=${LIMINAL_ASSETS_DIR}/fonts/Ysabeau-SemiBoldItalic.ttf
)
tool_scene(${LIMINAL_ASSETS_DIR}/scenes/SceneBase.xml)
tool_vnscene(${LIMINAL_ASSETS_DIR}/scenes/Scene1Prologue0.xml)
tool_prefab(${LIMINAL_ASSETS_DIR}/prefabs/EthPrefab.xml)
tool_prefab(${LIMINAL_ASSETS_DIR}/prefabs/VNTextbox.xml)
set(LIMINAL_ASSETS_DIR )
include("${DAWN_ASSETS_SOURCE_DIR}/games/liminal/CMakeLists.txt")

4
src/dawnopengl/scene/components/display/material/SimpleTexturedMaterial.cpp
View File

@ -37,8 +37,8 @@ std::vector<struct ShaderPassItem> SimpleTexturedMaterial::getRenderPasses(IRend
onlyPass.parameterBuffers[shader->bufferRenderPipeline] = &context.renderPipeline->shaderBuffer;
onlyPass.renderFlags = (
RENDER_MANAGER_RENDER_FLAG_BLEND |
RENDER_MANAGER_RENDER_FLAG_DEPTH_TEST
RENDER_MANAGER_RENDER_FLAG_BLEND
// RENDER_MANAGER_RENDER_FLAG_DEPTH_TEST
);
if(this->texture != nullptr) {

13
src/dawnshared/util/Xml.cpp
View File

@ -201,10 +201,17 @@ void Xml::load(Xml *xml, std::string data, size_t *j) {
buffer += '\'';
} else if(sc == "quot") {
buffer += '"';
} else if(sc == "nbsp") {
buffer += ' ';
} else {
// Unknown special char?
std::cout << "Unknown Special character: " << sc << std::endl;
assertUnreachable();
// Try parse as integer
if(sc.size() > 1 && sc[0] == '#') {
int code = std::stoi(sc.substr(1));
buffer += (char)code;
} else {
std::cout << "Unknown Special character: " << sc << std::endl;
assertUnreachable();
}
}
} else {
buffer += c;

2
src/dawntools/prefabtool/CMakeLists.txt
View File

@ -48,7 +48,7 @@ function(tool_prefab in)
STRING(REGEX REPLACE "[\.|\\|\/]" "-" prefab_name ${in})
add_custom_target(prefab_${prefab_name}
COMMAND prefabtool --input="${DAWN_ASSETS_SOURCE_DIR}/${in}" --output="${DAWN_GENERATED_DIR}/generatedprefabs" --sources="${DAWN_SOURCES_DIR}"
COMMAND prefabtool --input="${in}" --output="${DAWN_GENERATED_DIR}/generatedprefabs" --sources="${DAWN_SOURCES_DIR}"
COMMENT "Generating prefab from ${in}"
DEPENDS ${DEPS}
)

2
src/dawntools/scenetool/CMakeLists.txt
View File

@ -49,7 +49,7 @@ function(tool_scene in)
STRING(REGEX REPLACE "[\.|\\|\/]" "-" scene_name ${in})
add_custom_target(scene_${scene_name}
COMMAND scenetool --input="${DAWN_ASSETS_SOURCE_DIR}/${in}" --output="${DAWN_GENERATED_DIR}/generatedscenes" --sources="${DAWN_SOURCES_DIR}"
COMMAND scenetool --input="${in}" --output="${DAWN_GENERATED_DIR}/generatedscenes" --sources="${DAWN_SOURCES_DIR}"
COMMENT "Generating scene from ${in}"
DEPENDS ${DEPS}
)

2
src/dawntools/texturetool/CMakeLists.txt
View File

@ -68,7 +68,7 @@ function(tool_texture target)
add_custom_target(${target}
COMMAND texturetool
--input="${DAWN_ASSETS_SOURCE_DIR}/${FILE}"
--input="${FILE}"
--output="${DAWN_ASSETS_BUILD_DIR}/${target}"
--wrapX="${WRAP_X}"
--wrapY="${WRAP_Y}"

13
src/dawntools/truetypetool/CMakeLists.txt
View File

@ -53,19 +53,6 @@ function(tool_truetype target)
set(DEPS truetypetool)
endif()
if(DEFINED REGULAR)
set(REGULAR "${DAWN_ASSETS_SOURCE_DIR}/${REGULAR}")
endif()
if(DEFINED BOLD)
set(BOLD "${DAWN_ASSETS_SOURCE_DIR}/${BOLD}")
endif()
if(DEFINED ITALICS)
set(ITALICS "${DAWN_ASSETS_SOURCE_DIR}/${ITALICS}")
endif()
if(DEFINED BOLD_ITALICS)
set(BOLD_ITALICS "${DAWN_ASSETS_SOURCE_DIR}/${BOLD_ITALICS}")
endif()
add_custom_target(${target}
COMMAND truetypetool
--output="${DAWN_ASSETS_BUILD_DIR}/${target}.truetype"

10
src/dawntools/util/generator/SceneAssetGenerator.cpp
View File

@ -10,6 +10,7 @@ using namespace Dawn;
void SceneAssetGenerator::generate(
std::map<std::string, std::string> &assetMap,
int32_t &assetNumber,
std::vector<std::string> *publicProperties,
std::vector<std::string> *initBody,
std::vector<std::string> *assetsBody,
struct SceneAsset *asset,
@ -17,6 +18,7 @@ void SceneAssetGenerator::generate(
) {
std::string assetType = "";
bool_t componentInit = true;
if(asset->ref.empty()) {
asset->usageName = "asset" + std::to_string(assetNumber++);
} else {
@ -40,6 +42,12 @@ void SceneAssetGenerator::generate(
assertUnreachable();
}
line(initBody, "auto " + asset->usageName + " = man->get<" + assetType + ">(\"" + asset->fileName + "\");", "");
if(!asset->ref.empty()) {
line(publicProperties, assetType + " *" + asset->usageName + " = nullptr;", "");
line(initBody, asset->usageName + " = man->get<" + assetType + ">(\"" + asset->fileName + "\");", "");
} else {
line(initBody, "auto " + asset->usageName + " = man->get<" + assetType + ">(\"" + asset->fileName + "\");", "");
}
line(assetsBody, "assets.push_back(man->get<" + assetType + ">(\"" + asset->fileName + "\"));", "");
}

1
src/dawntools/util/generator/SceneAssetGenerator.hpp
View File

@ -13,6 +13,7 @@ namespace Dawn {
static void generate(
std::map<std::string, std::string> &assetMap,
int32_t &assetNumber,
std::vector<std::string> *publicProperties,
std::vector<std::string> *initBody,
std::vector<std::string> *assetsBody,
struct SceneAsset *asset,

1
src/dawntools/util/generator/SceneItemGenerator.cpp
View File

@ -149,6 +149,7 @@ void SceneItemGenerator::generate(
SceneAssetGenerator::generate(
assetMap,
assetNumber,
publicProperties,
initBody,
assetBody,
&(*itAssets),

2
src/dawntools/vnscenetool/CMakeLists.txt
View File

@ -52,7 +52,7 @@ function(tool_vnscene in)
STRING(REGEX REPLACE "[\.|\\|\/]" "-" scene_name ${in})
add_custom_target(scene_${scene_name}
COMMAND vnscenetool --input="${DAWN_ASSETS_SOURCE_DIR}/${in}" --output="${DAWN_GENERATED_DIR}/generatedscenes"
COMMAND vnscenetool --input="${in}" --output="${DAWN_GENERATED_DIR}/generatedscenes"
COMMENT "Generating vnscene from ${in}"
DEPENDS ${DEPS}
)