mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 01:36:56 +02:00
Linked ZLIB to voxels library
This commit is contained in:
parent
d79acea6a7
commit
7d94f65448
4 changed files with 9 additions and 4 deletions
|
@ -1390,7 +1390,7 @@ void Application::importVoxels() {
|
||||||
} else if (fileNameString.endsWith(".svo", Qt::CaseInsensitive)) {
|
} else if (fileNameString.endsWith(".svo", Qt::CaseInsensitive)) {
|
||||||
importVoxels.readFromSVOFile(fileName);
|
importVoxels.readFromSVOFile(fileName);
|
||||||
} else {
|
} else {
|
||||||
importVoxels.readFromSchematicsFile(fileName);
|
importVoxels.readFromSchematicFile(fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
VoxelNode* selectedNode = _voxels.getVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
|
VoxelNode* selectedNode = _voxels.getVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
|
||||||
|
|
|
@ -15,4 +15,9 @@ include(${MACRO_DIR}/IncludeGLM.cmake)
|
||||||
include_glm(${TARGET_NAME} ${ROOT_DIR})
|
include_glm(${TARGET_NAME} ${ROOT_DIR})
|
||||||
|
|
||||||
include(${MACRO_DIR}/LinkHifiLibrary.cmake)
|
include(${MACRO_DIR}/LinkHifiLibrary.cmake)
|
||||||
link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
|
link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
|
||||||
|
|
||||||
|
# link ZLIB
|
||||||
|
find_package(ZLIB)
|
||||||
|
include_directories(${ZLIB_INCLUDE_DIRS})
|
||||||
|
target_link_libraries(${TARGET_NAME} ${ZLIB_LIBRARIES})
|
||||||
|
|
|
@ -1457,7 +1457,7 @@ bool VoxelTree::readFromSquareARGB32Pixels(const uint32_t* pixels, int dimension
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool VoxelTree::readFromSchematicsFile(const char *fileName) {
|
bool VoxelTree::readFromSchematicFile(const char *fileName) {
|
||||||
std::stringstream ss;
|
std::stringstream ss;
|
||||||
int err = retrieveData(fileName, ss);
|
int err = retrieveData(fileName, ss);
|
||||||
if (err && ss.get() != TAG_Compound) {
|
if (err && ss.get() != TAG_Compound) {
|
||||||
|
|
|
@ -135,7 +135,7 @@ public:
|
||||||
bool readFromSVOFile(const char* filename);
|
bool readFromSVOFile(const char* filename);
|
||||||
// reads voxels from square image with alpha as a Y-axis
|
// reads voxels from square image with alpha as a Y-axis
|
||||||
bool readFromSquareARGB32Pixels(const uint32_t* pixels, int dimension);
|
bool readFromSquareARGB32Pixels(const uint32_t* pixels, int dimension);
|
||||||
bool readFromSchematicsFile(const char* filename);
|
bool readFromSchematicFile(const char* filename);
|
||||||
void computeBlockColor(int id, int data, int& r, int& g, int& b, int& create);
|
void computeBlockColor(int id, int data, int& r, int& g, int& b, int& create);
|
||||||
|
|
||||||
unsigned long getVoxelCount();
|
unsigned long getVoxelCount();
|
||||||
|
|
Loading…
Reference in a new issue