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

[not wip] This PR has imploded #257

Closed
wants to merge 44 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
39f87fd
Update .gitignore
jordan4ibanez Nov 29, 2023
5b0bddd
Rip out quake 2 & 3 enums
jordan4ibanez Nov 29, 2023
d3771fd
Rip out quake 3 static map
jordan4ibanez Nov 29, 2023
dde2ef0
Rip out 3ds studio
jordan4ibanez Nov 29, 2023
f7bf20a
Rip out 2 forgotten formats
jordan4ibanez Nov 29, 2023
a25db8f
DESTROY CSM file
jordan4ibanez Nov 29, 2023
f379cd6
Obliterate OCTAL
jordan4ibanez Nov 29, 2023
8af4128
Half life 3
jordan4ibanez Nov 29, 2023
4b30b4e
Remove any ref to md2
jordan4ibanez Nov 29, 2023
dad3dba
*asterisk asterisk*
jordan4ibanez Nov 29, 2023
43e61fb
Rip out some BSP
jordan4ibanez Nov 29, 2023
b7e6074
bsp is gone
jordan4ibanez Nov 29, 2023
f4bc32e
3d studio is 0d
jordan4ibanez Nov 29, 2023
0e21716
It's no one's 3d anymore
jordan4ibanez Nov 29, 2023
ac3aea4
lmts
jordan4ibanez Nov 29, 2023
8c487bc
OCT
jordan4ibanez Nov 29, 2023
471a066
ply
jordan4ibanez Nov 29, 2023
684736b
.mesh
jordan4ibanez Nov 29, 2023
bb7afff
stl
jordan4ibanez Nov 29, 2023
6c6868b
Update ISceneManager.h
jordan4ibanez Nov 29, 2023
c87c314
lwo
jordan4ibanez Nov 29, 2023
6164860
mdl
jordan4ibanez Nov 29, 2023
e288082
DMF
jordan4ibanez Nov 29, 2023
3ba7412
Collada
jordan4ibanez Nov 29, 2023
58d5696
csm
jordan4ibanez Nov 29, 2023
a95de83
smf
jordan4ibanez Nov 29, 2023
821ad77
Rip out OBJ
jordan4ibanez Nov 29, 2023
04c1ab2
Rip out .x
jordan4ibanez Nov 29, 2023
af49570
B3D is annihilated
jordan4ibanez Nov 29, 2023
44a2362
I don't even know why we have file writers
jordan4ibanez Nov 29, 2023
796e7a6
Wipe B3D refs
jordan4ibanez Nov 29, 2023
396655e
Destroy the B3D mess file loaders
jordan4ibanez Nov 29, 2023
3b650b1
Get this thing ready
jordan4ibanez Nov 29, 2023
3d07245
Tear out mesh writers
jordan4ibanez Nov 29, 2023
e87c36a
Shamelessly dump Josiah's GLTF loaders in
jordan4ibanez Nov 29, 2023
7f9fe97
Add enumerator back in for GLTF
jordan4ibanez Nov 29, 2023
71b4349
Blindly dump tinygltf in like a neanderthal
jordan4ibanez Nov 29, 2023
7daa75e
Create settings.json
jordan4ibanez Nov 29, 2023
a2ced9b
Make this thing actually attempt to load
jordan4ibanez Nov 29, 2023
7c010f8
Now load the loader
jordan4ibanez Nov 29, 2023
d9082b4
Now dump tinygltf into irrlicht source
jordan4ibanez Nov 29, 2023
ab0d5b0
Now duct tape json together for CXX 17
jordan4ibanez Nov 29, 2023
f8c9eea
Finish duct taping this thing together
jordan4ibanez Nov 29, 2023
64114eb
Fix unneeded code
jordan4ibanez Nov 29, 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
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"files.associations": {
"filesystem": "cpp"
}
}
65 changes: 0 additions & 65 deletions include/EMeshWriterEnums.h

This file was deleted.

6 changes: 2 additions & 4 deletions include/IAnimatedMesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace scene
frame number is getFrameCount() - 1;
\param detailLevel: Level of detail. 0 is the lowest, 255 the
highest level of detail. Most meshes will ignore the detail level.
\param startFrameLoop: Because some animated meshes (.MD2) are
\param startFrameLoop: Because some animated meshes (.MD2 [which no longer exists in irrlicht]) are
blended between 2 static frames, and maybe animated in a loop,
the startFrameLoop and the endFrameLoop have to be defined, to
prevent the animation to be blended between frames which are
Expand All @@ -57,9 +57,7 @@ namespace scene

//! Returns the type of the animated mesh.
/** In most cases it is not necessary to use this method.
This is useful for making a safe downcast. For example,
if getMeshType() returns EAMT_MD2 it's safe to cast the
IAnimatedMesh to IAnimatedMeshMD2.
This is useful for making a safe downcast.
\returns Type of the mesh. */
E_ANIMATED_MESH_TYPE getMeshType() const override
{
Expand Down
37 changes: 3 additions & 34 deletions include/IMesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,37 +21,8 @@ namespace scene
//! Unknown animated mesh type.
EAMT_UNKNOWN = 0,

//! Quake 2 MD2 model file
EAMT_MD2,

//! Quake 3 MD3 model file
EAMT_MD3,

//! Maya .obj static model
EAMT_OBJ,

//! Quake 3 .bsp static Map
EAMT_BSP,

//! 3D Studio .3ds file
EAMT_3DS,

//! My3D Mesh, the file format by Zhuck Dimitry
EAMT_MY3D,

//! Pulsar LMTools .lmts file. This Irrlicht loader was written by Jonas Petersen
EAMT_LMTS,

//! Cartography Shop .csm file. This loader was created by Saurav Mohapatra.
EAMT_CSM,

//! .oct file for Paul Nette's FSRad or from Murphy McCauley's Blender .oct exporter.
/** The oct file format contains 3D geometry and lightmaps and
can be loaded directly by Irrlicht */
EAMT_OCT,

//! Halflife MDL model file
EAMT_MDL_HALFLIFE,
//! Graphics Language Transmission Format 2.0 (.gltf) mesh
EAMT_GLTF2,

//! generic skinned mesh
EAMT_SKINNED,
Expand Down Expand Up @@ -111,9 +82,7 @@ namespace scene
virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX) = 0;

//! Returns the type of the meshes.
/** This is useful for making a safe downcast. For example,
if getMeshType() returns EAMT_MD2 it's safe to cast the
IMesh to IAnimatedMeshMD2.
/** This is useful for making a safe downcast.
Note: It's no longer just about animated meshes, that name has just historical reasons.
\returns Type of the mesh */
virtual E_ANIMATED_MESH_TYPE getMeshType() const
Expand Down
55 changes: 0 additions & 55 deletions include/IMeshWriter.h

This file was deleted.

Loading