mirror of
https://github.com/redstrate/Novus.git
synced 2025-04-27 14:17:45 +00:00
Update libphysis, accommodate for API changes
This commit is contained in:
parent
50f9faac0f
commit
46564264f1
3 changed files with 6 additions and 5 deletions
1
extern/CMakeLists.txt
vendored
1
extern/CMakeLists.txt
vendored
|
@ -10,6 +10,7 @@ corrosion_import_crate(MANIFEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/libphysis/Cargo
|
|||
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libphysis/logger)
|
||||
|
||||
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::Logger ALIAS physis-logger)
|
||||
|
|
2
extern/libphysis
vendored
2
extern/libphysis
vendored
|
@ -1 +1 @@
|
|||
Subproject commit 20834755560176fe0981990f686bcfaebd309e0b
|
||||
Subproject commit 743ab6bfb1e164c7acc19666321ce1b883ed1da9
|
|
@ -256,9 +256,9 @@ RenderMaterial MDLPart::createMaterial(const physis_Material &material)
|
|||
newMaterial.type = MaterialType::Skin;
|
||||
}
|
||||
|
||||
if (material.color_table.num_rows > 0) {
|
||||
if (material.legacy_color_table.num_rows > 0) {
|
||||
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;
|
||||
|
||||
|
@ -266,7 +266,7 @@ RenderMaterial MDLPart::createMaterial(const physis_Material &material)
|
|||
int offset = 0;
|
||||
for (int y = 0; y < height; y++) {
|
||||
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;
|
||||
if (x == 0) {
|
||||
|
@ -422,4 +422,4 @@ int MDLPart::numModels() const
|
|||
return models.size();
|
||||
}
|
||||
|
||||
#include "moc_mdlpart.cpp"
|
||||
#include "moc_mdlpart.cpp"
|
||||
|
|
Loading…
Add table
Reference in a new issue