diff --git a/README.md b/README.md index 9653f92..bed10fe 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,12 @@ A demake of Portal for the Nintendo 64. First, you will need to setup [Modern SDK](https://crashoveride95.github.io/n64hbrew/modernsdk/startoff.html). +After installing modern sdk you will want to also install + +``` +sudo apt install libnustd +``` + Next, you will need to download Blender 3.0 or higher. Then set the environment variable `BLENDER_3_0` to be the absolute path where the Blender executable is located on your system.
@@ -17,19 +23,30 @@ pip install vpk
-Install `vtf2png`, `sfz2n64`, and `skeletool64`. +Install `vtf2png`, `sfz2n64`, and setup `skeletool64`. ```sh echo "deb [trusted=yes] https://lambertjamesd.github.io/apt/ ./" \ - | tee /etc/apt/sources.list.d/lambertjamesd.list - -sudo apt install vtf2png sfz2n64 skeletool64 mpg123 + | sudo tee /etc/apt/sources.list.d/lambertjamesd.list +sudo apt update +sudo apt install vtf2png sfz2n64 mpg123 sox imagemagick ```
-Install ImageMagick. +Setup and build skelatool64 + ``` -sudo apt install imagemagick +cd skelatool64 +./setup_dependencies.sh +make +``` + +
+ +You will need to install nodejs. You can use apt for this + +``` +sudo apt install nodejs ```
diff --git a/skelatool64/makefile b/skelatool64/makefile index 3280f46..55b78b4 100644 --- a/skelatool64/makefile +++ b/skelatool64/makefile @@ -1,7 +1,7 @@ GCC_FLAGS = -Wall -Werror -g -rdynamic -I./yaml-cpp/include -LINKER_FLAGS = -L./yaml-cpp -lassimp -lyaml-cpp -lpng -ltiff -llua -ldl +LINKER_FLAGS = -L./yaml-cpp -lassimp -lyaml-cpp -lpng -ltiff -llua5.4 -ldl SRC_FILES = main.cpp $(shell find src/ -type f -name '*.cpp') diff --git a/skelatool64/setup_dependencies.sh b/skelatool64/setup_dependencies.sh index 27a57c4..eeeb147 100755 --- a/skelatool64/setup_dependencies.sh +++ b/skelatool64/setup_dependencies.sh @@ -1,6 +1,6 @@ #!/usr/bin/bash -sudo apt install -y libpng-dev libtiff-dev libassimp-dev +sudo apt install -y libpng-dev libtiff-dev libassimp-dev g++ liblua5.4-dev cmake pushd $(dirname "$0") diff --git a/skelatool64/src/lua_generator/LuaBasicTypes.h b/skelatool64/src/lua_generator/LuaBasicTypes.h index 28bdf7a..4406f78 100644 --- a/skelatool64/src/lua_generator/LuaBasicTypes.h +++ b/skelatool64/src/lua_generator/LuaBasicTypes.h @@ -1,7 +1,7 @@ #ifndef __LUA_BASIC_TYPES_H__ #define __LUA_BASIC_TYPES_H__ -#include +#include #include #include #include diff --git a/skelatool64/src/lua_generator/LuaDefinitionWriter.h b/skelatool64/src/lua_generator/LuaDefinitionWriter.h index ec3f5cc..e303f39 100644 --- a/skelatool64/src/lua_generator/LuaDefinitionWriter.h +++ b/skelatool64/src/lua_generator/LuaDefinitionWriter.h @@ -1,7 +1,7 @@ #ifndef __LUA_DEFINITON_WRITER_H__ #define __LUA_DEFINITON_WRITER_H__ -#include +#include #include "../CFileDefinition.h" bool dumpDefinitions(lua_State* L, CFileDefinition& fileDef, const char* filename); diff --git a/skelatool64/src/lua_generator/LuaDisplayListSettings.h b/skelatool64/src/lua_generator/LuaDisplayListSettings.h index 6fac504..847a0fb 100644 --- a/skelatool64/src/lua_generator/LuaDisplayListSettings.h +++ b/skelatool64/src/lua_generator/LuaDisplayListSettings.h @@ -1,7 +1,7 @@ #ifndef __LUA_DISPLAY_LIST_SETTINGS_H__ #define __LUA_DISPLAY_LIST_SETTINGS_H__ -#include +#include #include "../DisplayListSettings.h" void fromLua(lua_State* L, DisplayListSettings& result, const DisplayListSettings& defaults); diff --git a/skelatool64/src/lua_generator/LuaGenerator.cpp b/skelatool64/src/lua_generator/LuaGenerator.cpp index f7f24e5..f119015 100644 --- a/skelatool64/src/lua_generator/LuaGenerator.cpp +++ b/skelatool64/src/lua_generator/LuaGenerator.cpp @@ -9,7 +9,7 @@ #include "LuaDisplayListSettings.h" #include "LuaBasicTypes.h" -#include +#include #include #define EMIT(name) extern const char _binary_build_lua_##name##_out_start[]; extern const char _binary_build_lua_##name##_out_end[]; diff --git a/skelatool64/src/lua_generator/LuaGenerator.h b/skelatool64/src/lua_generator/LuaGenerator.h index 13b1bba..889e8d2 100644 --- a/skelatool64/src/lua_generator/LuaGenerator.h +++ b/skelatool64/src/lua_generator/LuaGenerator.h @@ -1,7 +1,7 @@ #ifndef __LUA_GENERATOR_H__ #define __LUA_GENERATOR_H__ -#include +#include #include #include "../CFileDefinition.h" #include "../DisplayListSettings.h" diff --git a/skelatool64/src/lua_generator/LuaGeometry.h b/skelatool64/src/lua_generator/LuaGeometry.h index f7d0775..989cff3 100644 --- a/skelatool64/src/lua_generator/LuaGeometry.h +++ b/skelatool64/src/lua_generator/LuaGeometry.h @@ -1,7 +1,7 @@ #ifndef __LUA_GEOMETRY_H__ #define __LUA_GEOMETRY_H__ -#include +#include #include void toLua(lua_State* L, const aiQuaternion& quaternion); diff --git a/skelatool64/src/lua_generator/LuaMesh.h b/skelatool64/src/lua_generator/LuaMesh.h index 03e50a3..46f67ad 100644 --- a/skelatool64/src/lua_generator/LuaMesh.h +++ b/skelatool64/src/lua_generator/LuaMesh.h @@ -1,7 +1,7 @@ #ifndef __LUA_MESH_H__ #define __LUA_MESH_H__ -#include +#include #include #include "../CFileDefinition.h" #include "../DisplayListSettings.h" diff --git a/skelatool64/src/lua_generator/LuaNodeGroups.h b/skelatool64/src/lua_generator/LuaNodeGroups.h index a995b5b..025eda4 100644 --- a/skelatool64/src/lua_generator/LuaNodeGroups.h +++ b/skelatool64/src/lua_generator/LuaNodeGroups.h @@ -1,7 +1,7 @@ #ifndef __LUA_NODE_GROUPS_H__ #define __LUA_NODE_GROUPS_H__ -#include +#include #include "../definition_generator/DefinitionGenerator.h" void populateLuaNodeGroups(lua_State* L, NodeGroups& nodeGroups); diff --git a/skelatool64/src/lua_generator/LuaScene.h b/skelatool64/src/lua_generator/LuaScene.h index babeb24..6a23730 100644 --- a/skelatool64/src/lua_generator/LuaScene.h +++ b/skelatool64/src/lua_generator/LuaScene.h @@ -2,7 +2,7 @@ #define __LUA_SCENE_H__ #include -#include +#include #include "../DisplayListSettings.h" #include "../CFileDefinition.h" diff --git a/skelatool64/src/lua_generator/LuaTransform.h b/skelatool64/src/lua_generator/LuaTransform.h index 3f75e39..5b37a88 100644 --- a/skelatool64/src/lua_generator/LuaTransform.h +++ b/skelatool64/src/lua_generator/LuaTransform.h @@ -1,7 +1,7 @@ #ifndef __LUA_TRANSFORM_H__ #define __LUA_TRANSFORM_H__ -#include +#include #include #include "LuaGeometry.h" diff --git a/skelatool64/src/lua_generator/LuaUtils.h b/skelatool64/src/lua_generator/LuaUtils.h index e241ab0..0fbf823 100644 --- a/skelatool64/src/lua_generator/LuaUtils.h +++ b/skelatool64/src/lua_generator/LuaUtils.h @@ -1,7 +1,7 @@ #ifndef __LUA_UTILS_H__ #define __LUA_UTILS_H__ -#include +#include void luaLoadModuleFunction(lua_State* L, const char* moduleName, const char* functionName);