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
Download Patch File Download Diff File Expand all files Collapse all files

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}
)