Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

B3D JSON #256

Closed
wants to merge 89 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
8f54e69
Update .gitignore
jordan4ibanez Nov 26, 2023
650ccf9
Dump the entire json library in
jordan4ibanez Nov 26, 2023
d5360a2
Shamelessly copy Josiah
jordan4ibanez Nov 26, 2023
7468b42
Copy Josiah again
jordan4ibanez Nov 26, 2023
e1c59c0
I have no idea if this is necessary
jordan4ibanez Nov 26, 2023
3f327ce
It's a model type now, yay
jordan4ibanez Nov 26, 2023
1a95a43
The
jordan4ibanez Nov 26, 2023
6406dbb
Wow, there's still nothing, incredible
jordan4ibanez Nov 26, 2023
0de8776
test my integration in discord
jordan4ibanez Nov 26, 2023
3571fd7
test it again
jordan4ibanez Nov 26, 2023
bb1bb8f
again
jordan4ibanez Nov 26, 2023
f593446
Now it's serious time
jordan4ibanez Nov 26, 2023
8a0b6ee
Now load it
jordan4ibanez Nov 26, 2023
a20637b
Fixes
jordan4ibanez Nov 26, 2023
59409df
now load it
jordan4ibanez Nov 26, 2023
781435d
Now we have a new problem to solve
jordan4ibanez Nov 26, 2023
9f39338
Simplify this disaster
jordan4ibanez Nov 26, 2023
a3f07d1
It works!
jordan4ibanez Nov 26, 2023
191596b
Let's see if we can see an actual file
jordan4ibanez Nov 26, 2023
8e4e9e3
We're gonna work with JSON for a bit
jordan4ibanez Nov 26, 2023
d992084
Start building up the staircase
jordan4ibanez Nov 26, 2023
9483f17
Entering the realm of JSON
jordan4ibanez Nov 26, 2023
aad38e8
Now we're climbing up the ladder
jordan4ibanez Nov 26, 2023
e0577ac
I'm actually having fun with C++
jordan4ibanez Nov 26, 2023
e2e0e3d
Important comments
jordan4ibanez Nov 26, 2023
1ca05bb
Small important changes
jordan4ibanez Nov 26, 2023
e033159
Add a whole bunch of random things
jordan4ibanez Nov 26, 2023
571619b
Fix a crucial issue
jordan4ibanez Nov 26, 2023
4aca3ee
Great success!
jordan4ibanez Nov 26, 2023
fadbb24
Add a note now we can actually start working
jordan4ibanez Nov 26, 2023
2a16c10
Make this more readable
jordan4ibanez Nov 26, 2023
9f93cf3
Add some very fancy tooling
jordan4ibanez Nov 26, 2023
ad5e899
That's awesome
jordan4ibanez Nov 26, 2023
e5d27d1
Just slam a home run with this tooling
jordan4ibanez Nov 26, 2023
ab511a8
Now parse quaternions
jordan4ibanez Nov 26, 2023
7deaf11
Now get rid of this white space
jordan4ibanez Nov 26, 2023
26d5d8f
Now we start building off the normal B3D loader
jordan4ibanez Nov 28, 2023
80e5da3
Now we're going to very carefully implement b3d
jordan4ibanez Nov 28, 2023
132f1ae
Now we can use C++ tricks to make this easier
jordan4ibanez Nov 28, 2023
a8f67ac
Actually, maybe more functional approach is better
jordan4ibanez Nov 28, 2023
e445262
Now we're gonna bring back those tricks better
jordan4ibanez Nov 28, 2023
288f757
Seeing a pattern evolving
jordan4ibanez Nov 28, 2023
b4233a5
Add a comment
jordan4ibanez Nov 28, 2023
ec907d8
Make it so we can inline this
jordan4ibanez Nov 28, 2023
58e0581
Now inline this
jordan4ibanez Nov 28, 2023
89ae5f0
Add information
jordan4ibanez Nov 28, 2023
3f87764
Make this a bit elegant
jordan4ibanez Nov 28, 2023
11e73fa
Fix this up
jordan4ibanez Nov 28, 2023
bc79fe8
And then fix this part
jordan4ibanez Nov 28, 2023
b64ac8c
Now get the header to load
jordan4ibanez Nov 28, 2023
57f0f84
Invert this to maintain sanity
jordan4ibanez Nov 28, 2023
afad32e
And then add future plans
jordan4ibanez Nov 28, 2023
7ce8858
Now make it even more elegant
jordan4ibanez Nov 28, 2023
3cfb2a7
Important note
jordan4ibanez Nov 28, 2023
dc88633
Deprecate old implementation & note
jordan4ibanez Nov 28, 2023
9dace24
Should probably mark it as deprecated
jordan4ibanez Nov 28, 2023
42b9658
Start work on TEXS
jordan4ibanez Nov 28, 2023
5f60711
Move memory referencing around
jordan4ibanez Nov 28, 2023
5b25a4e
Very fancy
jordan4ibanez Nov 28, 2023
f5c4999
Break a lot of things to fix a lot of things
jordan4ibanez Nov 28, 2023
b233539
Now fix a lot of things
jordan4ibanez Nov 28, 2023
d7b5caa
Now fix the things
jordan4ibanez Nov 28, 2023
52a284c
Now we can build upon it
jordan4ibanez Nov 28, 2023
075e0c5
Now make it extra nice
jordan4ibanez Nov 28, 2023
177e247
Refurbish/reprogram this logic path
jordan4ibanez Nov 28, 2023
9a5e6dd
Make my life a bit easier
jordan4ibanez Nov 28, 2023
7cddd10
Successfully convert Win32 to Posix
jordan4ibanez Nov 28, 2023
516b5a7
Fix warnings, change to errors
jordan4ibanez Nov 28, 2023
7c6cf9c
And then change it back so it's obvious in term
jordan4ibanez Nov 28, 2023
ad20f19
Remove debugging
jordan4ibanez Nov 28, 2023
e32f3d8
More debugging
jordan4ibanez Nov 28, 2023
9709156
More debugging
jordan4ibanez Nov 28, 2023
d65fe36
Make this easier to read
jordan4ibanez Nov 28, 2023
5becfee
Flags & Blend
jordan4ibanez Nov 28, 2023
e63d440
Verbose position
jordan4ibanez Nov 28, 2023
55a2d7f
Verbose scale
jordan4ibanez Nov 28, 2023
9efa535
Angle
jordan4ibanez Nov 28, 2023
5685736
Set up BRUS
jordan4ibanez Nov 28, 2023
dbd40ba
Add an important helper
jordan4ibanez Nov 28, 2023
66c9f3c
Framework for BRUS
jordan4ibanez Nov 28, 2023
162f453
RGBA
jordan4ibanez Nov 28, 2023
da18594
Blend & FX
jordan4ibanez Nov 28, 2023
77b0021
Note
jordan4ibanez Nov 28, 2023
30e46b5
Make this look nicer
jordan4ibanez Nov 28, 2023
206df1f
Begin textures in BRUS
jordan4ibanez Nov 28, 2023
f722ffb
Add some basic things
jordan4ibanez Nov 28, 2023
124c544
Maybe if we created the memory ptr it wouldn't crash
jordan4ibanez Nov 28, 2023
fcc8c42
Add a more serious note
jordan4ibanez Nov 28, 2023
42595ba
Find source of segfault
jordan4ibanez Nov 28, 2023
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@ scripts/glext.h
*visualstudio/

# vscode cmake plugin
build/*
build/*
CTestTestfile.cmake
source/Irrlicht/CTestTestfile.cmake
test/CTestTestfile.cmake
60 changes: 60 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"files.associations": {
"iostream": "cpp",
"fstream": "cpp",
"new": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"any": "cpp",
"array": "cpp",
"atomic": "cpp",
"*.tcc": "cpp",
"cctype": "cpp",
"chrono": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"forward_list": "cpp",
"list": "cpp",
"vector": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"filesystem": "cpp",
"functional": "cpp",
"iterator": "cpp",
"map": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"optional": "cpp",
"ratio": "cpp",
"string": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"istream": "cpp",
"limits": "cpp",
"ostream": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"cinttypes": "cpp",
"typeinfo": "cpp",
"valarray": "cpp"
}
}
3 changes: 3 additions & 0 deletions include/IMesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ namespace scene
//! Halflife MDL model file
EAMT_MDL_HALFLIFE,

//! Blitz3D JSON model file
EAMT_B3D_JSON,

//! generic skinned mesh
EAMT_SKINNED,

Expand Down
Loading
Loading