From f1fe73d1909a2448a004a88362a1a532d0d4f7c3 Mon Sep 17 00:00:00 2001 From: sanine Date: Sun, 12 Feb 2023 23:53:22 -0600 Subject: switch to tinyobj and nanovg from assimp and cairo --- .../test/models/NFF/NFF/ManyEarthsNotJustOne.nff | 25 --------------- libs/assimp/test/models/NFF/NFF/WithCamera.nff | 24 --------------- libs/assimp/test/models/NFF/NFF/cone.nff | 26 ---------------- libs/assimp/test/models/NFF/NFF/cylinder.nff | 10 ------ libs/assimp/test/models/NFF/NFF/dodecahedron.nff | 1 - libs/assimp/test/models/NFF/NFF/hexahedron.nff | 2 -- libs/assimp/test/models/NFF/NFF/octahedron.nff | 1 - libs/assimp/test/models/NFF/NFF/positionTest.nff | 36 ---------------------- libs/assimp/test/models/NFF/NFF/spheres.nff | 25 --------------- libs/assimp/test/models/NFF/NFF/tetrahedron.nff | 1 - 10 files changed, 151 deletions(-) delete mode 100644 libs/assimp/test/models/NFF/NFF/ManyEarthsNotJustOne.nff delete mode 100644 libs/assimp/test/models/NFF/NFF/WithCamera.nff delete mode 100644 libs/assimp/test/models/NFF/NFF/cone.nff delete mode 100644 libs/assimp/test/models/NFF/NFF/cylinder.nff delete mode 100644 libs/assimp/test/models/NFF/NFF/dodecahedron.nff delete mode 100644 libs/assimp/test/models/NFF/NFF/hexahedron.nff delete mode 100644 libs/assimp/test/models/NFF/NFF/octahedron.nff delete mode 100644 libs/assimp/test/models/NFF/NFF/positionTest.nff delete mode 100644 libs/assimp/test/models/NFF/NFF/spheres.nff delete mode 100644 libs/assimp/test/models/NFF/NFF/tetrahedron.nff (limited to 'libs/assimp/test/models/NFF') diff --git a/libs/assimp/test/models/NFF/NFF/ManyEarthsNotJustOne.nff b/libs/assimp/test/models/NFF/NFF/ManyEarthsNotJustOne.nff deleted file mode 100644 index de9d064..0000000 --- a/libs/assimp/test/models/NFF/NFF/ManyEarthsNotJustOne.nff +++ /dev/null @@ -1,25 +0,0 @@ -b 0.078 0.361 0.753 -v -from 2.1 1.3 1.7 -at 0 0 0 -up 0 0 1 -angle 45 -hither 0.01 -resolution 512 512 -l 4 3 2 -l 1 -4 4 -l -3 1 5 - -f 1 0.9 0.7 0.5 0.5 45.2776 0 1 ./../../LWO/LWo2/MappingModes/EarthSpherical.jpg -s 0 0 0 0.5 - -f 1 0.9 0.7 0.5 0.5 45.2776 0 1 ./../../LWO/LWo2/MappingModes/EarthSpherical.jpg -s 0.272166 0.272166 0.544331 0.16665 -s 0.643951 0.172546 1.11022e-16 0.16665 -s 0.172546 0.643951 1.11022e-16 0.16665 -s -0.371785 0.0996195 0.544331 0.16665 -s -0.471405 0.471405 1.11022e-16 0.16665 -s -0.643951 -0.172546 1.11022e-16 0.16665 -s 0.0996195 -0.371785 0.544331 0.16665 -s -0.172546 -0.643951 1.11022e-16 0.16665 -s 0.471405 -0.471405 1.11022e-16 0.16665 diff --git a/libs/assimp/test/models/NFF/NFF/WithCamera.nff b/libs/assimp/test/models/NFF/NFF/WithCamera.nff deleted file mode 100644 index 765dddc..0000000 --- a/libs/assimp/test/models/NFF/NFF/WithCamera.nff +++ /dev/null @@ -1,24 +0,0 @@ -# viewpoint -v -from 0 3 10 -at 0 0 0 -up 0 1 0 -angle 60 -hither 0 -resolution 640 480 - -f 1 0 0 0.8 .8 20 0 1 -s -2 0.8 0 2 - -f 0 1 0 0.8 .8 20 0 1 -s 1 -1.5 1 2.2 - -f 0 0 1 0.8 .8 20 0 1 -s 3 3 -2 2 - -f 1 1 1 0.8 .8 20 0 1 -p 4 --7 -1 -7 --7 -1 7 - 7 -1 7 - 7 -1 -7 diff --git a/libs/assimp/test/models/NFF/NFF/cone.nff b/libs/assimp/test/models/NFF/NFF/cone.nff deleted file mode 100644 index 7a5e366..0000000 --- a/libs/assimp/test/models/NFF/NFF/cone.nff +++ /dev/null @@ -1,26 +0,0 @@ - -#red -f 1.0 0.0 0.0 0.5 45.2776 0 1 cantfindme.png - - -tess 4 - - -# a simple cone - should go directly through the center -c -10 10 10 3 --10 -10 -10 6 - - -f 1.0 1.0 1.0 0.5 0.5 45.2776 0 1 ./../../LWO/LWo2/MappingModes/EarthSpherical.jpg -s -10 -10 -10 2 -s 10 10 10 3 - - -#white -f 1.0 1.0 1.0 0.5 0.5 45.2776 0 1 ./../../LWO/LWo2/MappingModes/EarthCylindric.jpg - -# another cone, closed this time -c -20 20 20 6 -11 11 11 0 \ No newline at end of file diff --git a/libs/assimp/test/models/NFF/NFF/cylinder.nff b/libs/assimp/test/models/NFF/NFF/cylinder.nff deleted file mode 100644 index b96ec1c..0000000 --- a/libs/assimp/test/models/NFF/NFF/cylinder.nff +++ /dev/null @@ -1,10 +0,0 @@ - -#red -f 1 0.9 0.7 0.5 0.5 45.2776 0 1 ./../../LWOFiles/LWo2/MappingModes/EarthCylindric.jpg - -tess 4 - -# a simple cylinder - should go directly through the center -c -10 10 10 6 --10 -10 -10 6 \ No newline at end of file diff --git a/libs/assimp/test/models/NFF/NFF/dodecahedron.nff b/libs/assimp/test/models/NFF/NFF/dodecahedron.nff deleted file mode 100644 index 6ab5051..0000000 --- a/libs/assimp/test/models/NFF/NFF/dodecahedron.nff +++ /dev/null @@ -1 +0,0 @@ -dod 0 0 0 5 \ No newline at end of file diff --git a/libs/assimp/test/models/NFF/NFF/hexahedron.nff b/libs/assimp/test/models/NFF/NFF/hexahedron.nff deleted file mode 100644 index afa62de..0000000 --- a/libs/assimp/test/models/NFF/NFF/hexahedron.nff +++ /dev/null @@ -1,2 +0,0 @@ -f 1 0 0 -hex 0 0 0 5 10 20 \ No newline at end of file diff --git a/libs/assimp/test/models/NFF/NFF/octahedron.nff b/libs/assimp/test/models/NFF/NFF/octahedron.nff deleted file mode 100644 index eac88e7..0000000 --- a/libs/assimp/test/models/NFF/NFF/octahedron.nff +++ /dev/null @@ -1 +0,0 @@ -oct 0 0 0 5 5 5 \ No newline at end of file diff --git a/libs/assimp/test/models/NFF/NFF/positionTest.nff b/libs/assimp/test/models/NFF/NFF/positionTest.nff deleted file mode 100644 index d0715a0..0000000 --- a/libs/assimp/test/models/NFF/NFF/positionTest.nff +++ /dev/null @@ -1,36 +0,0 @@ - -# Enable high-quality subdivision -tess 4 - - -# This represents a C4H10 molecule (Butan) - - -f 0.3 0.3 0.3 1 1 -s 0 0 0 5 -s 20 0 0 5 -s 40 0 0 5 -s 60 0 0 5 - - - -# Switch to white -f 1 1 1 1 1 - -s -5 0 0 3 -s 0 5 0 3 -s 0 -5 0 3 -s 20 5 0 3 -s 20 -5 0 3 -s 40 5 0 3 -s 40 -5 0 3 -s 60 5 0 3 -s 60 -5 0 3 -s 65 0 0 3 - - -# Now a tube to connect them -c -0 0 0 0.8 -60 0 0 0.8 - diff --git a/libs/assimp/test/models/NFF/NFF/spheres.nff b/libs/assimp/test/models/NFF/NFF/spheres.nff deleted file mode 100644 index 4b750d7..0000000 --- a/libs/assimp/test/models/NFF/NFF/spheres.nff +++ /dev/null @@ -1,25 +0,0 @@ - -#default color - -# A simple sphere -s 5.0 5.0 5.0 3.0 - -#blue -f 0.0 0.0 1.0 0 1 1 1 - -# Another simple sphere -s 5.0 4.0 8.0 3.0 - -#green -f 1.0 1.0 1.0 0.5 0.5 45.2776 0 1 ./../../LWO/LWo2/MappingModes/EarthCylindric.jpg - -# And another one -s 1.0 -4.0 2.0 4.0 2 2 - -#red -f 1.0 0.0 0.0 0 1 1 - - -# An icosahedron -tess 0 -s 1 -15 2 4 8 8 \ No newline at end of file diff --git a/libs/assimp/test/models/NFF/NFF/tetrahedron.nff b/libs/assimp/test/models/NFF/NFF/tetrahedron.nff deleted file mode 100644 index 78c3bdf..0000000 --- a/libs/assimp/test/models/NFF/NFF/tetrahedron.nff +++ /dev/null @@ -1 +0,0 @@ -tet 0 0 0 5 \ No newline at end of file -- cgit v1.2.1