redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-04-28 06:37:44 +00:00
Code Activity

Update libphysis, accommodate for API changes

Browse source
This commit is contained in:
Joshua Goins 2024-11-02 19:51:32 -04:00
parent 50f9faac0f
commit 46564264f1
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extern/CMakeLists.txt vendored
View file

@ -10,6 +10,7 @@ corrosion_import_crate(MANIFEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/libphysis/Cargo
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libphysis/logger) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libphysis/logger)
target_include_directories(physis INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/libphysis/target/public) target_include_directories(physis INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/libphysis/target/public)
target_link_libraries(physis INTERFACE z)
add_library(Physis::Physis ALIAS physis) add_library(Physis::Physis ALIAS physis)
add_library(Physis::Logger ALIAS physis-logger) add_library(Physis::Logger ALIAS physis-logger)

2
extern/libphysis vendored

@ -1 +1 @@
Subproject commit 20834755560176fe0981990f686bcfaebd309e0b Subproject commit 743ab6bfb1e164c7acc19666321ce1b883ed1da9

6
parts/mdl/mdlpart.cpp
View file

@ -256,9 +256,9 @@ RenderMaterial MDLPart::createMaterial(const physis_Material &material)
newMaterial.type = MaterialType::Skin; newMaterial.type = MaterialType::Skin;
} }
if (material.color_table.num_rows > 0) { if (material.legacy_color_table.num_rows > 0) {
int width = 4; int width = 4;
int height = material.color_table.num_rows; int height = material.legacy_color_table.num_rows;
qInfo() << "Creating color table" << width << "X" << height; qInfo() << "Creating color table" << width << "X" << height;
@ -266,7 +266,7 @@ RenderMaterial MDLPart::createMaterial(const physis_Material &material)
int offset = 0; int offset = 0;
for (int y = 0; y < height; y++) { for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) { for (int x = 0; x < width; x++) {
const auto row = material.color_table.rows[y]; const auto row = material.legacy_color_table.rows[y];
glm::vec4 color; glm::vec4 color;
if (x == 0) { if (x == 0) {