v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_X3D_IndexedLineSet

pull/5362/head
Kim Kulling 2024-01-09 19:23:50 +01:00 committed by GitHub
parent 2b01ba28d8 c8ca1a48ec
commit ba2b227b74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
66 changed files with 133 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -311,9 +311,9 @@ ELSEIF( MINGW )
SET(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")
ENDIF()
IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long -Wa,-mbig-obj -g ${CMAKE_CXX_FLAGS}")
SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wno-dangling-reference -Wall -Wno-long-long -Wa,-mbig-obj -g ${CMAKE_CXX_FLAGS}")
ELSE()
SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long -Wa,-mbig-obj -O3 ${CMAKE_CXX_FLAGS}")
SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wno-dangling-reference -Wall -Wno-long-long -Wa,-mbig-obj -O3 ${CMAKE_CXX_FLAGS}")
ENDIF()
SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
ENDIF()

1
Dockerfile
View File

@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y ninja-build \
RUN add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update
WORKDIR /opt
RUN apt install zlib1g-dev
# Build Assimp
RUN git clone https://github.com/assimp/assimp.git /opt/assimp

4
code/AssetLib/IFC/IFCReaderGen1_2x3.cpp
View File

@ -2725,6 +2725,10 @@ template <> size_t GenericFill<IfcSpatialStructureElement>(const DB& db, const L
do { // convert the 'CompositionType' argument
std::shared_ptr<const DataType> arg = params[base++];
if (dynamic_cast<const ISDERIVED*>(&*arg)) { in->ObjectHelper<Assimp::IFC::Schema_2x3::IfcSpatialStructureElement,2>::aux_is_derived[1]=true; break; }
if (dynamic_cast<const UNSET *>(&*arg)) {
// Consider assigning the default value as in->CompositionType = "ELEMENT".
break;
}
try { GenericConvert( in->CompositionType, arg, db ); break; }
catch (const TypeError& t) { throw TypeError(t.what() + std::string(" - expected argument 8 to IfcSpatialStructureElement to be a `IfcElementCompositionEnum`")); }
} while (false);

1
code/AssetLib/glTF2/glTF2Exporter.cpp
View File

@ -912,6 +912,7 @@ void glTF2Exporter::ExportMaterials() {
if (GetMatSpecular(mat, specular)) {
mAsset->extensionsUsed.KHR_materials_specular = true;
m->materialSpecular = Nullable<MaterialSpecular>(specular);
GetMatColor(mat, m->pbrMetallicRoughness.baseColorFactor, AI_MATKEY_COLOR_DIFFUSE);
}
MaterialSheen sheen;

44
test/models/IRR/EpisodeII_TheDwarfesStrikeBack.irr
View File

@ -32,7 +32,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="textures/editor_defaults/default_texture.png" />
<texture name="Texture1" value="assets/default_texture.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -89,7 +89,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="skybox/default_skybox2.jpg" />
<texture name="Texture1" value="assets/skybox/default_skybox2.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -128,7 +128,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="skybox/default_skybox1.jpg" />
<texture name="Texture1" value="assets/skybox/default_skybox1.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -167,7 +167,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="skybox/default_skybox0.jpg" />
<texture name="Texture1" value="assets/skybox/default_skybox0.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -206,7 +206,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="skybox/default_skybox3.jpg" />
<texture name="Texture1" value="assets/skybox/default_skybox3.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -245,7 +245,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="skybox/default_skyboxup.jpg" />
<texture name="Texture1" value="assets/skybox/default_skyboxup.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -284,7 +284,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="skybox/default_skyboxdn.jpg" />
<texture name="Texture1" value="assets/skybox/default_skyboxdn.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -329,7 +329,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="Looping" value="true" />
<bool name="ReadOnlyMaterials" value="false" />
<float name="FramesPerSecond" value="0.250000" />
@ -345,7 +345,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -384,7 +384,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -468,7 +468,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="Looping" value="true" />
<bool name="ReadOnlyMaterials" value="false" />
<float name="FramesPerSecond" value="0.250000" />
@ -484,7 +484,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -523,7 +523,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -620,7 +620,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="textures/editor_defaults/default_texture.png" />
<texture name="Texture1" value="assets/default_texture.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -678,7 +678,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="textures/editor_defaults/default_texture.png" />
<texture name="Texture1" value="assets/default_texture.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -723,7 +723,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="Looping" value="true" />
<bool name="ReadOnlyMaterials" value="false" />
<float name="FramesPerSecond" value="0.250000" />
@ -739,7 +739,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -778,7 +778,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -875,7 +875,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="textures/editor_defaults/default_texture.png" />
<texture name="Texture1" value="assets/default_texture.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -920,7 +920,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="Looping" value="true" />
<bool name="ReadOnlyMaterials" value="false" />
<float name="FramesPerSecond" value="0.250000" />
@ -936,7 +936,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -975,7 +975,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />

BIN
test/models/IRR/EpisodeII_TheDwarfesStrikeBack_UTF16LE.irr
View File

Binary file not shown.

38
test/models/IRR/EpisodeI_ANewDwarf.irr
View File

@ -33,8 +33,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="brownground_1-1.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/brownground_1-1.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />
@ -72,8 +72,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="crackedground_1-6.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />
@ -117,7 +117,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="ReadOnlyMaterials" value="false" />
</attributes>
@ -131,7 +131,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -170,7 +170,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -254,7 +254,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="ReadOnlyMaterials" value="false" />
</attributes>
@ -268,7 +268,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -307,7 +307,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -391,7 +391,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="ReadOnlyMaterials" value="false" />
</attributes>
@ -405,7 +405,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -444,7 +444,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -528,7 +528,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="ReadOnlyMaterials" value="false" />
</attributes>
@ -542,7 +542,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -581,7 +581,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -665,7 +665,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="ReadOnlyMaterials" value="false" />
</attributes>
@ -679,7 +679,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -718,7 +718,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />

BIN
test/models/IRR/EpisodeI_ANewDwarf_UTF16LE.irr
View File

Binary file not shown.

6
test/models/IRR/animMesh.irr
View File

@ -19,7 +19,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="Looping" value="true" />
<bool name="ReadOnlyMaterials" value="false" />
<float name="FramesPerSecond" value="0.025000" />
@ -35,7 +35,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -73,7 +73,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />

BIN
test/models/IRR/animMesh_UTF16LE.irr
View File

Binary file not shown.

0
test/models/IRR/1.png → test/models/IRR/assets/1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

0
test/models/IRR/SpiderTex.jpg → test/models/IRR/assets/SpiderTex.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
test/models/IRR/UVTransformTestImg.png → test/models/IRR/assets/UVTransformTestImg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

0
test/models/IRR/axe.jpg → test/models/IRR/assets/axe.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

0
test/models/IRR/brownground_1-1.jpg → test/models/IRR/assets/brownground_1-1.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 65 KiB

0
test/models/IRR/crackedground_1-6.jpg → test/models/IRR/assets/crackedground_1-6.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
test/models/IRR/assets/default.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB

BIN
test/models/IRR/assets/default_texture.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 258 KiB

0
test/models/IRR/drkwood2.jpg → test/models/IRR/assets/drkwood2.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 199 KiB

After

Width:  |  Height:  |  Size: 199 KiB

0
test/models/IRR/dwarf.jpg → test/models/IRR/assets/dwarf.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 82 KiB

0
test/models/IRR/dwarf.x → test/models/IRR/assets/dwarf.x
View File

0
test/models/IRR/earthSpherical.jpg → test/models/IRR/assets/earthSpherical.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 412 KiB

After

Width:  |  Height:  |  Size: 412 KiB

0
test/models/IRR/engineflare1.jpg → test/models/IRR/assets/engineflare1.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

11
test/models/IRR/assets/skybox/credits.txt 100644
View File

@ -0,0 +1,11 @@
This skybox is basing on a skydome texture from
http://mikepan.homeip.net/earth
Downloaded November 22th, 08
Distribution note:
"These royalty-free skydome textures work best when applied to a sphere or hemisphere"
Thanks for your great work!

BIN
test/models/IRR/assets/skybox/default_skybox0.jpg 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

BIN
test/models/IRR/assets/skybox/default_skybox1.jpg 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
test/models/IRR/assets/skybox/default_skybox2.jpg 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
test/models/IRR/assets/skybox/default_skybox3.jpg 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 35 KiB

BIN
test/models/IRR/assets/skybox/default_skyboxdn.jpg 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
test/models/IRR/assets/skybox/default_skyboxup.jpg 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.2 KiB

0
test/models/IRR/spider.mtl → test/models/IRR/assets/spider.mtl
View File

0
test/models/IRR/wal67ar_small.jpg → test/models/IRR/assets/wal67ar_small.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

0
test/models/IRR/wal69ar_small.jpg → test/models/IRR/assets/wal69ar_small.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

2
test/models/IRR/box.irr
View File

@ -32,7 +32,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="default.png" />
<texture name="Texture1" value="assets/default.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />

BIN
test/models/IRR/box_UTF16LE.irr
View File

Binary file not shown.

8
test/models/IRR/cellar.irrmesh
View File

@ -13,8 +13,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="brownground_1-1.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/brownground_1-1.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />
@ -870,8 +870,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="crackedground_1-6.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />

14
test/models/IRR/dawfInCellar_ChildOfCellar.irr
View File

@ -33,8 +33,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="brownground_1-1.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/brownground_1-1.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />
@ -71,8 +71,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="crackedground_1-6.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />
@ -113,7 +113,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="ReadOnlyMaterials" value="false" />
</attributes>
@ -127,7 +127,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -165,7 +165,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />

BIN
test/models/IRR/dawfInCellar_ChildOfCellar_UTF16LE.irr
View File

Binary file not shown.

14
test/models/IRR/dawfInCellar_SameHierarchy.irr
View File

@ -33,8 +33,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="brownground_1-1.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/brownground_1-1.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />
@ -71,8 +71,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="crackedground_1-6.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />
@ -115,7 +115,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="ReadOnlyMaterials" value="false" />
</attributes>
@ -129,7 +129,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -167,7 +167,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />

BIN
test/models/IRR/dawfInCellar_SameHierarchy_UTF16LE.irr
View File

Binary file not shown.

34
test/models/IRR/instancing.irr
View File

@ -33,7 +33,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -71,7 +71,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -153,7 +153,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="ReadOnlyMaterials" value="false" />
</attributes>
@ -167,7 +167,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -205,7 +205,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -287,7 +287,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="ReadOnlyMaterials" value="false" />
</attributes>
@ -301,7 +301,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -339,7 +339,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -421,7 +421,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="ReadOnlyMaterials" value="false" />
</attributes>
@ -435,7 +435,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -473,7 +473,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -555,7 +555,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="ReadOnlyMaterials" value="false" />
</attributes>
@ -569,7 +569,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -607,7 +607,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -689,7 +689,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="ReadOnlyMaterials" value="false" />
</attributes>
@ -703,7 +703,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -741,7 +741,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />

20
test/models/IRR/scenegraphAnim.irr
View File

@ -126,7 +126,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="UVTransformTestImg.png" />
<texture name="Texture1" value="assets/UVTransformTestImg.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -197,7 +197,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="Looping" value="true" />
<bool name="ReadOnlyMaterials" value="false" />
<float name="FramesPerSecond" value="0.025000" />
@ -213,7 +213,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -251,7 +251,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -347,8 +347,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="brownground_1-1.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/brownground_1-1.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />
@ -385,8 +385,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="crackedground_1-6.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />
@ -442,7 +442,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="UVTransformTestImg.png" />
<texture name="Texture1" value="assets/UVTransformTestImg.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -512,7 +512,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="UVTransformTestImg.png" />
<texture name="Texture1" value="assets/UVTransformTestImg.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />

20
test/models/IRR/scenegraphAnimMod.irr
View File

@ -126,7 +126,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="UVTransformTestImg.png" />
<texture name="Texture1" value="assets/UVTransformTestImg.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -197,7 +197,7 @@
<enum name="AutomaticCulling" value="box" />
<int name="DebugDataVisible" value="0" />
<bool name="IsDebugObject" value="false" />
<string name="Mesh" value="dwarf.x" />
<string name="Mesh" value="assets/dwarf.x" />
<bool name="Looping" value="true" />
<bool name="ReadOnlyMaterials" value="false" />
<float name="FramesPerSecond" value="0.025000" />
@ -213,7 +213,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="axe.jpg" />
<texture name="Texture1" value="assets/axe.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -251,7 +251,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="dwarf.jpg" />
<texture name="Texture1" value="assets/dwarf.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -347,8 +347,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="brownground_1-1.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/brownground_1-1.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />
@ -385,8 +385,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="crackedground_1-6.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />
@ -442,7 +442,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="UVTransformTestImg.png" />
<texture name="Texture1" value="assets/UVTransformTestImg.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -512,7 +512,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="UVTransformTestImg.png" />
<texture name="Texture1" value="assets/UVTransformTestImg.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />

BIN
test/models/IRR/scenegraphAnimMod_UTF16LE.irr
View File

Binary file not shown.

BIN
test/models/IRR/scenegraphAnim_UTF16LE.irr
View File

Binary file not shown.

2
test/models/IRR/sphere.irr
View File

@ -34,7 +34,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="earthSpherical.jpg" />
<texture name="Texture1" value="assets/earthSpherical.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />

BIN
test/models/IRR/sphere_UTF16LE.irr
View File

Binary file not shown.

0
test/models/IRRMesh/1.png → test/models/IRRMesh/assets/1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

0
test/models/IRRMesh/SpiderTex.jpg → test/models/IRRMesh/assets/SpiderTex.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
test/models/IRRMesh/assets/UVTransformTestImg.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
test/models/IRRMesh/assets/UVTransform_OffsetUV0.5-mirrorUV.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

BIN
test/models/IRRMesh/assets/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 KiB

BIN
test/models/IRRMesh/assets/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72_mirrorU.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 128 KiB

BIN
test/models/IRRMesh/assets/UVTransform_ScaleUV2x_Rotate45.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 108 KiB

0
test/models/IRRMesh/brownground_1-1.jpg → test/models/IRRMesh/assets/brownground_1-1.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 65 KiB

0
test/models/IRRMesh/crackedground_1-6.jpg → test/models/IRRMesh/assets/crackedground_1-6.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

0
test/models/IRRMesh/drkwood2.jpg → test/models/IRRMesh/assets/drkwood2.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 199 KiB

After

Width:  |  Height:  |  Size: 199 KiB

0
test/models/IRRMesh/engineflare1.jpg → test/models/IRRMesh/assets/engineflare1.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

0
test/models/IRRMesh/wal67ar_small.jpg → test/models/IRRMesh/assets/wal67ar_small.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

0
test/models/IRRMesh/wal69ar_small.jpg → test/models/IRRMesh/assets/wal69ar_small.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

8
test/models/IRRMesh/cellar.irrmesh
View File

@ -13,8 +13,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="brownground_1-1.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/brownground_1-1.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />
@ -870,8 +870,8 @@
<float name="Shininess" value="0.750000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="crackedground_1-6.jpg" />
<texture name="Texture2" value="1.png" />
<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
<texture name="Texture2" value="assets/1.png" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
<bool name="Wireframe" value="false" />

BIN
test/models/IRRMesh/cellar_UTF16LE.irrmesh
View File

Binary file not shown.

8
test/models/IRRMesh/spider.irrmesh
View File

@ -13,7 +13,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="wal67ar_small.jpg" />
<texture name="Texture1" value="assets/wal67ar_small.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -354,7 +354,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="SpiderTex.jpg" />
<texture name="Texture1" value="assets/SpiderTex.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -485,7 +485,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="drkwood2.jpg" />
<texture name="Texture1" value="assets/drkwood2.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -1609,7 +1609,7 @@
<float name="Shininess" value="0.000000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="engineflare1.jpg" />
<texture name="Texture1" value="assets/engineflare1.jpg" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />

BIN
test/models/IRRMesh/spider_UTF16LE.irrmesh
View File

Binary file not shown.

10
test/models/IRRMesh/testFormatDetection.xml
View File

@ -13,7 +13,7 @@
<float name="Shininess" value="0.100000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="" />
<texture name="Texture1" value="assets/UVTransformTestImg.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -96,7 +96,7 @@
<float name="Shininess" value="0.100000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="" />
<texture name="Texture1" value="assets/UVTransform_OffsetUV0.5-mirrorUV.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -179,7 +179,7 @@
<float name="Shininess" value="0.100000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="" />
<texture name="Texture1" value="assets/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -262,7 +262,7 @@
<float name="Shininess" value="0.100000" />
<float name="Param1" value="0.000000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="" />
<texture name="Texture1" value="assets/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72_mirrorU.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />
@ -345,7 +345,7 @@
<float name="Shininess" value="0.100000" />
<float name="Param1" value="0.170000" />
<float name="Param2" value="0.000000" />
<texture name="Texture1" value="" />
<texture name="Texture1" value="assets/UVTransform_ScaleUV2x_Rotate45.png" />
<texture name="Texture2" value="" />
<texture name="Texture3" value="" />
<texture name="Texture4" value="" />

BIN
test/models/IRRMesh/testFormatDetection_UTF16LE.xml
View File

Binary file not shown.