Commit Graph

623 Commits

Author SHA1 Message Date
Lars Müller
036b40a9d8 Fix gltf static mesh loading issues (#14)
* Support u8 / u32 indices

* Skip primitives without vertices

* Add support for non-indexed geometry & skipping primitives

* Fix possible memory leak on error

* Use SSkinnedMesh

* Check indices

* Properly mirror node hierarchy

* Update .gitignore

* Reorder includes

* Add some throws for logic errors

* Fix non-indexed geometry winding order, add unit test

* Address code review comments

* Add matrix transform unit test
2024-04-18 07:37:36 -05:00
Lars Müller
0faf1320c5 Move from tinygltf to tiniergltf (#13)
* Remove tinygltf

* Integrate tiniergltf

* Update build.yml to include jsoncpp

* Namespace target

* Undo noexcept removal, readd move constructor

* Remove debug throw

* Remove now obsolete build code

* Bump CMake minimum version to 3.12

* Fix oops

* Remove unnecessary install/export

* Remove tinygltf from Config.cmake.in

* Take inspiration from Minetest's FindJson.cmake

* Move tiniergltf to separate repo

* CI: Install git

* Bump tiniergltf version (obtain jsoncpp via FetchContent)

* Remove jsoncpp from build dependency list
2024-04-18 07:37:10 -05:00
jordan4ibanez
777ec9d130 Fix getScale()
* Fix getScale()

* Create blender_cube_scaled.gltf

* Add scaling unit test

* Remove comment

* Undo github's silent reversion of 1,1,1
2024-04-18 07:34:58 -05:00
JosiahWI
f33b8a612d Axe the minimum-cmake CI build
This is useful, but has no business being in this PR. Off with its head.
2024-04-18 07:34:58 -05:00
Lars Mueller
e2b05f0dc9 Fix memory leak caused by missing drop 2024-04-18 07:34:58 -05:00
jordan4ibanez
f8f10248b4 Package glTF spec docs with comments
* git --CRUSH

And try to make this line the same

Now undo my gitignore nonsense

Hail mary

Move these functions to the top

More documentation

Add some serious documentation

Move this to the top

Readability & documentation

Add some documentation

Add spec documentation

Make this more more complex to make it less complex

Move this up & document

Make this more readable for me

Document and make this more readable

Move this out of the way and document it

Update CGLTFMeshFileLoader.cpp

Documentation

Document

Update CGLTFMeshFileLoader.cpp

Document

Move entry point to bottom

Part 5

Part 4

Part 3

Part 2

Allman -> OTBS (readability for me)

Consolidate

Remove unneeded function

These files are annoying

* fix #1

* fix 2

* indentation

* Remove redundant function

* Remove redundant function

* add trailing new line

* Stop an interesting build error with a template

* Code reduction

* Document bytestride

* Add more detail to chain hierarchy

* Dump this huge vscode thing in here for no reason

* Document 3 more functions

* Document copyTcoords

* Dump in (incorrect) scale documentation for node

* Add a readable description

* Fix incorrect getScale

* Add update based on context of function

* Add documentation, fix another one

* Document another

* Document another

* And document another

* Document this nice function

* Bolt in some future use documentation

* Add highlighting for IDE

* Just shovel on more docs to this

* 2 more comments

* I think that's all of them

* Add some wild west debuggin

* And then update this comment

* Bolt on isAccessorNormalized()

* Bolt in an absolute hack job to test

* Now clean this mess up and give josiah ref material

* Fix Josiah's request for scale

* Fix josiah request

* Fix josiah request .vscode

Fix indentation

Fix indentation

Fix indentation

* Unfix getScale()

again
2024-04-18 07:34:49 -05:00
JosiahWI
95a4030b50 Handle byte stride on vertex buffers
Vertex buffers (and only vertex buffers) may have a byte stride
specified.
2024-04-18 07:34:03 -05:00
JosiahWI
86026f9205 Add operator<< definition for vector3d 2024-04-18 07:34:02 -05:00
JosiahWI
eabc84a420 Do not install tinygltf export from Irrlicht 2024-04-18 07:33:37 -05:00
Josiah VanderZee
05ede68af1 Borrow CReadFile for tests
The method to load a mesh from a file was removed. This is not a good
fix, but it will keep the tests working until a file loader can be
properly exposed to the tests.
2024-04-18 07:33:37 -05:00
JosiahWI
16b784162b Print glTF loading issues to log 2024-04-18 07:33:37 -05:00
JosiahWI
53c92b0b1d Refactor vertex loading 2024-04-18 07:33:37 -05:00
JosiahWI
0896aae906 Extract loadPrimitives method from createMesh 2024-04-18 07:33:36 -05:00
JosiahWI
3930bd8c85 Rename ModelParser to MeshExtractor 2024-04-18 07:32:53 -05:00
JosiahWI
0f73c30a1f Mark ModelParser constructors noexcept 2024-04-18 07:31:37 -05:00
JosiahWI
22f6012d2e Document readVec3DF and getScale 2024-04-18 07:30:47 -05:00
JosiahWI
fd41ee02df Add const to numeric parameters 2024-04-18 07:28:34 -05:00
JosiahWI
60a5f5746f Return vector from getVertices 2024-04-18 07:28:03 -05:00
JosiahWI
ea22b642c1 Refactor getIndices() 2024-04-18 07:27:42 -05:00
JosiahWI
5f5dd7abfc Document coordinate system change at top of source 2024-04-18 07:27:22 -05:00
JosiahWI
8c9a5764ee Convert snake_case variable names to camelCase 2024-04-18 07:27:22 -05:00
JosiahWI
50da04297f Add r-value reference constructor to ModelParser 2024-04-18 07:27:20 -05:00
JosiahWI
85fdf95afa Fix function declaration indents 2024-04-18 07:26:48 -05:00
JosiahWI
79bfd8afbe Move parsing methods into ModelParser class 2024-04-18 07:26:11 -05:00
JosiahWI
2dbe3b866a Fix CMake tinygltf dependencies 2024-04-18 07:25:37 -05:00
JosiahWI
7e0d57b4fe Reorganize CGLTFMeshFileLoader help functions
I moved them all into static methods and changed the ordering in the
source file so that createMesh() would be close to the top of the file.
I also corrected formatting in some of the function declarations since I
had to change them anyway.
2024-04-18 07:25:34 -05:00
JosiahWI
2175cf6e1c Restore path accidentally removed in 584a46f 2024-04-18 07:24:54 -05:00
JosiahWI
3bbf3f7e0e Disable -Werror on minimum-cmake CI 2024-04-18 07:24:54 -05:00
JosiahWI
5bae506dc7 Set C compiler to gcc-5 for minimum-cmake CI
gcc-5 is already installed on the CI as a dependency for g++-5.
2024-04-18 07:24:53 -05:00
JosiahWI
774123844d Set C compiler to g++-5 on minimum-cmake CI 2024-04-18 07:24:53 -05:00
JosiahWI
9f2d5a1b8a Fix indentation style in CMakeLists 2024-04-18 07:24:52 -05:00
JosiahWI
4d4d8df2aa Work around TestBigEndian bug in cmake<3.9 2024-04-18 07:24:32 -05:00
JosiahWI
c9e05c6e9a Work around cmake<3.12 object target rules
CMake does not allow specifying usage requirements with
target_link_libraries() until version 3.12.
2024-04-18 07:24:31 -05:00
JosiahWI
eaebd34c4e Remove unneeded tinygltf include from header 2024-04-18 07:24:01 -05:00
JosiahWI
a3633afce3 Clarify behavior of BUILD_TESTING option in README 2024-04-18 07:23:21 -05:00
JosiahWI
673de228cf Do not fail to load glTF because of warnings 2024-04-18 07:22:44 -05:00
JosiahWI
5a190a6ab9 Mark CGLTFMeshFileLoader constructor as noexcept 2024-04-18 07:22:43 -05:00
JosiahWI
246ee9c3ca Register Catch2 tests with CTest 2024-04-18 07:22:24 -05:00
jordan4ibanez
030abc7b04 spaces->tabs 2024-04-18 07:21:59 -05:00
jordan4ibanez
971a9e214e Update code with requested changes
Fix mistake on github

Comply with changes 1

Comply with requested changes 2

Comply with requested changed 3

Comply with requested changed 4

Requested changed 5

Requested changed 6

Requested changed 7

Requested changed 8

Requested changed 9

Requested changed 10

Requested changes 11

Requested changes 12

This one wasn't even requested

I just turned on my vertical ruler and I'm going to go nuts

Line 81 doesn't exist anymore

Requested changes 13

Requested changes 14

Begin snow man test

Write a lot of tests for snow man

Add to git ignore

Now unignore it

Alphabetical order

Pass by reference

Pass by reference

vertexBuffer is now handled on stack

Preallocate indicesBuffer then reverse it when complete

Undo vertexBuffer stack change causing mac builds to fail

Use direct initialization on the vertexBuffer
2024-04-18 07:21:59 -05:00
jordan4ibanez
4a8602ed0f Fix embedded textures causing a model not to load 2024-04-18 07:21:59 -05:00
jordan4ibanez
08d226cdb5 Fix indices, inverted models, & multiple models failing to load
Fix embedded textures causing a model not to load

Add todo

Add another todo

Push current (broken) prototyping

Fix missing bracket

Make a single array object work

Convert hard array into dynamic vector

Simplify semantics

Remove "new"

Add blocker for vscode environment changes

Disable non-dynamic prototyping

Add comment

Add more informative debug & disable it

Add additional items to gitignore

Add debug info for scalar value

Output even more debug info

Make textures render correctly

Insert the indices properly

Update .gitignore

Disable y flip

Make a reusable vertex buffer :)

Disallow embedded textures

More disable

Set up implementation for contiguous model

Add a note

More automation & framework

Final framework before stepping into function overhaul

Hold track of current_index

Integrate iterators

More integration

Rename, it's going to need 2 counters

Correctly offset the count to the right

Sync normals with positions

Time to use a tuple

Set up other counters

Do return value

Do input passing

Make (somewhat) working contiguous model

Add getter for translation data

Add debug info for future utilization

Update .gitignore

More debug

Update .gitignore

Update .gitignore

Remove all debug info & clean up

Delete this thing

Automate everything & put it into spec

Spaces into tabs

Remove array include as build test

Fix the gitignore
2024-04-18 07:21:59 -05:00
Josiah VanderZee
0216a02ed4 Fix segfault from reading bad number of indices 2024-04-18 07:21:59 -05:00
Josiah VanderZee
f1042bf4c4 Update to latest branch of lukka/get-cmake 2024-04-18 07:21:59 -05:00
Josiah VanderZee
a326f27f6a Fix coordinate system change
Old code was inverting the X axis, new code inverts the Z axis.
2024-04-18 07:21:59 -05:00
Josiah VanderZee
47a195b4de Fix aliasing violation when reading primitives 2024-04-18 07:21:59 -05:00
Josiah VanderZee
3dc24abdb3 Remove DESCRIPTION from tinygltf project 2024-04-18 07:21:58 -05:00
Josiah VanderZee
cdad3a8f43 Switch to fixed branch of lukka/get-cmake action 2024-04-18 07:21:58 -05:00
Josiah VanderZee
7220104c37 Test vertex normals on cube 2024-04-18 07:21:58 -05:00
Josiah VanderZee
72cb09a566 Test for texture coordinates on cube 2024-04-18 07:21:58 -05:00