Skip to content

ogt_vox: added META chunk support that was added in MV 0.99.7.2 #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 15, 2025
+400 −17
Merged

ogt_vox: added META chunk support that was added in MV 0.99.7.2 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
777b784
ogt_vox: added META chunk support that was added in MV 0.99.7.2
mgerhardy Jul 14, 2025
ed84c17
ogt_vox: added unittests
mgerhardy Jul 14, 2025
de4e52b
ogt_vox: changed position of meta chunk to be directly after MAIN
mgerhardy Jul 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ set(APPS
apps/voxmerge.cpp
apps/voxseparate.cpp
demo/demo_vox.cpp
demo/tests.cpp
)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED on)

foreach (app ${APPS})
get_filename_component(APP_NAME ${app} NAME_WE)
get_filename_component(APP_NAME ${app} NAME_WE)
add_executable(${APP_NAME} ${app})
target_compile_options(${APP_NAME} PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/W4>
Expand All @@ -23,3 +24,5 @@ endforeach()

include(CTest)
add_test(NAME test_multiple_model_scene COMMAND $<TARGET_FILE:demo_vox> ${CMAKE_CURRENT_SOURCE_DIR}/demo/vox/test_multiple_model_scene.vox)

add_test(NAME tests COMMAND $<TARGET_FILE:tests> WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/demo/vox)
30 changes: 30 additions & 0 deletions demo/tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#include "tests.h"

TESTS_GLOBALS();

static void testGroups(void) {
const ogt_vox_scene *scene = load_vox_scene_with_groups("test_groups.vox");
ASSERT_NE_NULLPTR(scene);
ASSERT_EQ_INT(5, (int)scene->num_groups);
ASSERT_NE_NULLPTR(scene->groups);
EXPECT_EQ_STRING("characters", scene->groups[3].name);
EXPECT_EQ_STRING("text", scene->groups[4].name);
}

static void testMetaChunk(void) {
const char *filename = loadsave_vox_scene("test_meta_chunk.vox");
ASSERT_NE_NULLPTR(filename);
const ogt_vox_scene *scene = load_vox_scene_with_groups(filename);
ASSERT_NE_NULLPTR(scene);
EXPECT_EQ_INT(7, (int)scene->anim_range_start);
EXPECT_EQ_INT(36, (int)scene->anim_range_end);
}

int main(int argc, char *argv[]) {
TESTS_INIT();

ADD_TEST(testGroups);
ADD_TEST(testMetaChunk);

TESTS_SHUTDOWN();
}
304 changes: 304 additions & 0 deletions demo/tests.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,304 @@
#ifndef TEST_SHARED_H
#define TEST_SHARED_H

#define OGT_VOX_IMPLEMENTATION
#include "../src/ogt_vox.h"

#if defined(_MSC_VER)
#include <io.h>
#endif
#include <stdio.h>

// a helper function to load a magica voxel scene given a filename.
inline const ogt_vox_scene *load_vox_scene(const char *filename,
uint32_t scene_read_flags = 0) {
if (filename == nullptr) {
fprintf(stderr, "No filename given\n");
return nullptr;
}
// open the file
#if defined(_MSC_VER) && _MSC_VER >= 1400
FILE *fp;
if (0 != fopen_s(&fp, filename, "rb"))
fp = 0;
#else
FILE *fp = fopen(filename, "rb");
#endif
if (!fp) {
fprintf(stderr, "Failed to load %s\n", filename);
return nullptr;
}

// get the buffer size which matches the size of the file
fseek(fp, 0, SEEK_END);
uint32_t buffer_size = ftell(fp);
fseek(fp, 0, SEEK_SET);

// load the file into a memory buffer
uint8_t *buffer = new uint8_t[buffer_size];
fread(buffer, buffer_size, 1, fp);
fclose(fp);

// construct the scene from the buffer
const ogt_vox_scene *scene =
ogt_vox_read_scene_with_flags(buffer, buffer_size, scene_read_flags);

// the buffer can be safely deleted once the scene is instantiated.
delete[] buffer;

return scene;
}

inline const ogt_vox_scene *load_vox_scene_with_groups(const char *filename) {
return load_vox_scene(filename, k_read_scene_flags_groups);
}

// a helper function to save a magica voxel scene to disk.
inline bool save_vox_scene(const char *pcFilename, const ogt_vox_scene *scene) {
if (pcFilename == nullptr) {
fprintf(stderr, "No filename for saving given\n");
return false;
}
if (scene == nullptr) {
fprintf(stderr, "Failed to save vox scene to %s\n", pcFilename);
return false;
}
// save the scene back out.
uint32_t buffersize = 0;
uint8_t *buffer = ogt_vox_write_scene(scene, &buffersize);
if (buffer == nullptr) {
fprintf(stderr, "Failed to write vox scene to %s\n", pcFilename);
return false;
}

// open the file for write
#if defined(_MSC_VER) && _MSC_VER >= 1400
FILE *fp;
if (0 != fopen_s(&fp, pcFilename, "wb"))
fp = 0;
#else
FILE *fp = fopen(pcFilename, "wb");
#endif
if (!fp) {
fprintf(stderr, "Failed to open %s for writing\n", pcFilename);
ogt_vox_free(buffer);
return false;
}

fwrite(buffer, buffersize, 1, fp);
fclose(fp);
ogt_vox_free(buffer);
return true;
}

inline const char *loadsave_vox_scene(const char *filename) {
static const char *target_filename = "test.vox";
const ogt_vox_scene *scene = load_vox_scene_with_groups(filename);
if (!save_vox_scene(target_filename, scene)) {
return nullptr;
}
return target_filename;
}

#define TEST_STRINGIFY(arg) #arg

#define ADD_TEST(func) \
prevFailed = failed; \
errorBuf[0] = '\0'; \
printf("Testing %-30s...", TEST_STRINGIFY(func)); \
(func)(); \
if (prevFailed == failed) { \
printf(" [success]\n"); \
} else { \
printf(" [failed]\n"); \
printf("%s", errorBuf); \
} \
++tests

#define ADD_DISABLED_TEST(func) \
prevFailed = failed; \
errorBuf[0] = '\0'; \
if (!runDisabled) { \
printf("Skipping %-30s...", TEST_STRINGIFY(func)); \
printf(" [skip]\n"); \
} else { \
printf("Testing %-30s...", TEST_STRINGIFY(func)); \
(func)(); \
if (prevFailed == failed) { \
printf(" [success]\n"); \
} else { \
printf(" [failed]\n"); \
printf("%s", errorBuf); \
} \
} \
++tests

#define TESTS_GLOBALS() \
static int failed = 0; \
static int tests = 0; \
static int prevFailed = 0; \
static char errorBuf[4096] = ""; \
static int lastExpectedInt = 0; \
static float lastExpectedFloat = 0.0f; \
static const char *lastExpectedString = nullptr; \
static int runDisabled = 0;

#define TESTS_SHUTDOWN() \
printf("\nfailed tests: %i out of %i\n", failed, tests); \
if (failed != 0) { \
return 1; \
} \
return 0

#define TESTS_INIT() \
(void)lastExpectedInt; \
(void)lastExpectedFloat; \
(void)lastExpectedString; \
(void)runDisabled; \
(void)failed; \
(void)tests; \
(void)prevFailed; \
if (argc > 1) { \
if (!strcmp(argv[1], "--also_run_disabled_tests")) { \
runDisabled = 1; \
} else if (!strcmp(argv[1], "--help")) { \
printf("--also_run_disabled_tests : also run disabled tests"); \
return 0; \
} \
}

#define ASSERT_EQ_FLOAT(exp, actual) \
if (lastExpectedFloat = (actual), \
abs((exp) - lastExpectedFloat) > (epsilon)) { \
snprintf( \
errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY(actual) ": expected %f, but got %f (line %i)\n", \
exp, lastExpectedFloat, __LINE__); \
++failed; \
return; \
}

#define EXPECT_EQ_FLOAT(exp, actual, epsilon) \
if (lastExpectedFloat = (actual), \
abs((exp) - lastExpectedFloat) > (epsilon)) { \
snprintf( \
errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY(actual) ": expected %f, but got %f (line %i)\n", \
exp, lastExpectedFloat, __LINE__); \
++failed; \
}

#define ASSERT_EQ_INT(exp, actual) \
if (lastExpectedInt = (actual), (exp) != lastExpectedInt) { \
snprintf( \
errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY(actual) ": expected %i, but got %i (line %i)\n", \
exp, lastExpectedInt, __LINE__); \
++failed; \
return; \
}

#define EXPECT_EQ_INT(exp, actual) \
if (lastExpectedInt = (actual), (exp) != lastExpectedInt) { \
snprintf( \
errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY(actual) ": expected %i, but got %i (line %i)\n", \
exp, lastExpectedInt, __LINE__); \
++failed; \
}

#define EXPECT_BETWEEN_INT(minv, maxv, actual) \
if (lastExpectedInt = (actual), \
lastExpectedInt < (minv) || lastExpectedInt > (maxv)) { \
snprintf(errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY( \
actual) ": expected %i to in range of [%i:%i] (line %i)\n", \
lastExpectedInt, minv, maxv, __LINE__); \
++failed; \
}

#define EXPECT_GT_INT(exp, actual) \
if (lastExpectedInt = (actual), (exp) >= lastExpectedInt) { \
snprintf(errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY(actual) ": expected to be greater than %i, " \
"but got %i (line %i)\n", \
exp, lastExpectedInt, __LINE__); \
++failed; \
}

#define EXPECT_GE_INT(exp, actual) \
if (lastExpectedInt = (actual), (exp) > lastExpectedInt) { \
snprintf(errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY(actual) ": expected to be greater or equal " \
"to %i, but got %i (line %i)\n", \
exp, lastExpectedInt, __LINE__); \
++failed; \
}

#define EXPECT_LT_INT(exp, actual) \
if (lastExpectedInt = (actual), (exp) <= lastExpectedInt) { \
snprintf( \
errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY( \
actual) ": expected to be less than %i, but got %i (line %i)\n", \
exp, lastExpectedInt, __LINE__); \
++failed; \
}

#define EXPECT_LE_INT(exp, actual) \
if (lastExpectedInt = (actual), (exp) < lastExpectedInt) { \
snprintf(errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY(actual) ": expected to be less or equal to " \
"%i, but got %i (line %i)\n", \
exp, lastExpectedInt, __LINE__); \
++failed; \
}

#define EXPECT_NE_NULLPTR(actual) \
if ((actual) == nullptr) { \
snprintf( \
errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY(actual) ": expected to be not null (line %i)\n", \
__LINE__); \
++failed; \
}

#define ASSERT_NE_NULLPTR(actual) \
if ((actual) == nullptr) { \
snprintf( \
errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY(actual) ": expected to be not null (line %i)\n", \
__LINE__); \
++failed; \
return; \
}

#define ASSERT_EQ_STRING(exp, actual) \
if (lastExpectedString = (actual), strcmp(exp, lastExpectedString) != 0) { \
snprintf(errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY( \
actual) ": expected '%s', but got '%s' (line %i)\n", \
exp, lastExpectedString, __LINE__); \
++failed; \
return; \
}

#define EXPECT_EQ_STRING(exp, actual) \
if (lastExpectedString = (actual), strcmp(exp, lastExpectedString) != 0) { \
snprintf(errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY( \
actual) ": expected '%s', but got '%s' (line %i)\n", \
exp, lastExpectedString, __LINE__); \
++failed; \
}

#define EXPECT_NE_STRING(exp, actual) \
if (lastExpectedString = (actual), strcmp(exp, lastExpectedString) == 0) { \
snprintf(errorBuf + strlen(errorBuf), sizeof(errorBuf) - strlen(errorBuf), \
" - " TEST_STRINGIFY( \
actual) ": expected '%s', but got '%s' (line %i)\n", \
exp, lastExpectedString, __LINE__); \
++failed; \
}

#endif
1 change: 1 addition & 0 deletions demo/vox/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test.vox
Binary file added demo/vox/test_meta_chunk.vox
View file
Open in desktop
Binary file not shown.
Loading
Loading