Browse Source

chore : update sample scenes and meshes

Heedong Lee 3 years ago
parent
commit
791fc0452c
38 changed files with 145 additions and 1 deletions
  1. 1
    0
      .gitattributes
  2. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Empty-CO.mtl
  3. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Empty-CO.obj
  4. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Empty-RG.mtl
  5. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Empty-RG.obj
  6. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Empty-Squashed.mtl
  7. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Empty-Squashed.obj
  8. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Empty-White.mtl
  9. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Empty-White.obj
  10. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Glossy-Floor.mtl
  11. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Glossy-Floor.obj
  12. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Glossy.mtl
  13. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Glossy.obj
  14. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Mirror.mtl
  15. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Mirror.obj
  16. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Original.mtl
  17. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Original.obj
  18. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Sphere.mtl
  19. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Sphere.obj
  20. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Water.mtl
  21. BIN
      Samples/Data/meshes/CornellBox/CornellBox-Water.obj
  22. 12
    0
      Samples/Data/meshes/CornellBox/copyright.txt
  23. BIN
      Samples/Data/meshes/CornellBox/water.mtl
  24. BIN
      Samples/Data/meshes/CornellBox/water.obj
  25. BIN
      Samples/Data/meshes/Dragon/dragon.obj
  26. 12
    0
      Samples/Data/meshes/MoriKnob/copyright.txt
  27. BIN
      Samples/Data/meshes/MoriKnob/testObj.mtl
  28. BIN
      Samples/Data/meshes/MoriKnob/testObj.obj
  29. 9
    0
      Samples/Data/meshes/MoriKnob/testObjSolo.ArticulatedModel.Any
  30. 4
    0
      Samples/Data/meshes/MoriKnob/testObjWithBackground.ArticulatedModel.Any
  31. 25
    0
      Samples/Data/meshes/Sponza/copyright.txt
  32. BIN
      Samples/Data/meshes/Sponza/sponza.mtl
  33. BIN
      Samples/Data/meshes/Sponza/sponza.obj
  34. 0
    0
      Samples/Data/meshes/car/Car.obj
  35. 0
    0
      Samples/Data/meshes/chalet/chalet.jpg
  36. 0
    0
      Samples/Data/meshes/chalet/chalet.obj
  37. 0
    0
      Samples/Data/meshes/chalet/chalet.png
  38. 1
    1
      Samples/Mesh/Mesh.cpp

+ 1
- 0
.gitattributes View File

@@ -61,3 +61,4 @@
61 61
 *.png filter=lfs diff=lfs merge=lfs -text
62 62
 *.bmp filter=lfs diff=lfs merge=lfs -text
63 63
 *.obj filter=lfs diff=lfs merge=lfs -text
64
+*.mtl filter=lfs diff=lfs merge=lfs -text

BIN
Samples/Data/meshes/CornellBox/CornellBox-Empty-CO.mtl (Stored with Git LFS) View File

2
+oid sha256:ca3e2f05eebde1a9c157999d829d986f3a8621c325706ae64169e2ca95f0af68
3
+size 1259

BIN
Samples/Data/meshes/CornellBox/CornellBox-Empty-CO.obj (Stored with Git LFS) View File

2
+oid sha256:8371c533005e47a6017a5d2d4f5d644fdf9f38bd7a03cdba302049c2cac830b6
3
+size 1352

BIN
Samples/Data/meshes/CornellBox/CornellBox-Empty-RG.mtl (Stored with Git LFS) View File

2
+oid sha256:359b4bbad5f326c6508ea81ba6dc7ad3c8b5db5dae4e11a28cc3ced726f8d589
3
+size 1192

BIN
Samples/Data/meshes/CornellBox/CornellBox-Empty-RG.obj (Stored with Git LFS) View File

2
+oid sha256:d8b2330390e2ba513974863cba97a2ef8db584b75251e20d30e5ada0832ee7d9
3
+size 1349

BIN
Samples/Data/meshes/CornellBox/CornellBox-Empty-Squashed.mtl (Stored with Git LFS) View File

2
+oid sha256:852d2efee24eb700de6c35f093e7558259750e55cf8df83dde4b8b40070899d3
3
+size 1449

BIN
Samples/Data/meshes/CornellBox/CornellBox-Empty-Squashed.obj (Stored with Git LFS) View File

2
+oid sha256:8177027b1cae0c0f7acfd5d601f760f2b45c4cf0097a5b3020a8ba2a9a605444
3
+size 130684

BIN
Samples/Data/meshes/CornellBox/CornellBox-Empty-White.mtl (Stored with Git LFS) View File

2
+oid sha256:22182bcb98cdb5fb7703a31a86cdab5b9b5a902f856f1ec4b0f600af920aeea4
3
+size 1096

BIN
Samples/Data/meshes/CornellBox/CornellBox-Empty-White.obj (Stored with Git LFS) View File

2
+oid sha256:833f7e046403d6ea1f028c4d621449f9f400e6d577deaadce95c66b4ac8a17df
3
+size 1355

BIN
Samples/Data/meshes/CornellBox/CornellBox-Glossy-Floor.mtl (Stored with Git LFS) View File

2
+oid sha256:17cc22136ae64503b099c6f0ade87bc6552ae3cc2063881eb685533c01a0bdee
3
+size 1753

BIN
Samples/Data/meshes/CornellBox/CornellBox-Glossy-Floor.obj (Stored with Git LFS) View File

2
+oid sha256:11b6549999a2fee97a76cdd95f74c6192490059d878c240ea27e0ca46bdd44aa
3
+size 99393

BIN
Samples/Data/meshes/CornellBox/CornellBox-Glossy.mtl (Stored with Git LFS) View File

2
+oid sha256:b0c9b475855f992cffe59a63c586018319332c098aef011600ca633ca38f5782
3
+size 1197

BIN
Samples/Data/meshes/CornellBox/CornellBox-Glossy.obj (Stored with Git LFS) View File

2
+oid sha256:11b6549999a2fee97a76cdd95f74c6192490059d878c240ea27e0ca46bdd44aa
3
+size 99393

BIN
Samples/Data/meshes/CornellBox/CornellBox-Mirror.mtl (Stored with Git LFS) View File

2
+oid sha256:5445e870ec22a441d86b023b9dfe89c52c23fe794d99c4b174d2c7306995dab6
3
+size 1477

BIN
Samples/Data/meshes/CornellBox/CornellBox-Mirror.obj (Stored with Git LFS) View File

2
+oid sha256:4b179bbaf46afc2f8968d59b21b1bed0510e0e87cb4133a6700ab4253bf99b6a
3
+size 2949

BIN
Samples/Data/meshes/CornellBox/CornellBox-Original.mtl (Stored with Git LFS) View File

2
+oid sha256:1f687df1ba44bae18097242528fe39f36f1ff9f4e4b2a5c10bf36e08837bb857
3
+size 1443

BIN
Samples/Data/meshes/CornellBox/CornellBox-Original.obj (Stored with Git LFS) View File

2
+oid sha256:6e2b8b91590e54005fba03b1847c626ee4d9fd85f754045780e6c0001ada4188
3
+size 2897

BIN
Samples/Data/meshes/CornellBox/CornellBox-Sphere.mtl (Stored with Git LFS) View File

2
+oid sha256:2cd6fd8591c233670d8fcdfa77da583aec3c19396df52eb9cc84f18c6311152b
3
+size 1637

BIN
Samples/Data/meshes/CornellBox/CornellBox-Sphere.obj (Stored with Git LFS) View File

2
+oid sha256:74d3a8ad49b09bfe702980ae4c877861db01f722a586e3777735f7a0e2b833cc
3
+size 179267

BIN
Samples/Data/meshes/CornellBox/CornellBox-Water.mtl (Stored with Git LFS) View File

2
+oid sha256:07fc3ce3a76bc9b9e7b4646b6691a701f2afc84a520a02ed0f52d125a133e574
3
+size 1715

BIN
Samples/Data/meshes/CornellBox/CornellBox-Water.obj (Stored with Git LFS) View File

2
+oid sha256:ef051544c10e26e195afa67d66be20517cb600cadb2442d16171a0013c367559
3
+size 490471

+ 12
- 0
Samples/Data/meshes/CornellBox/copyright.txt View File

@@ -0,0 +1,12 @@
1
+# A set of eight Cornell Boxes in OBJ format.
2
+# Note that the real box is not a perfect cube, so
3
+# the faces are imperfect in this data set.
4
+#
5
+# Created by Guedis Cardenas and Morgan McGuire at Williams College, 2011
6
+# Attribution 3.0 Unported (CC BY 3.0) License
7
+# http://creativecommons.org/licenses/by/3.0/
8
+#
9
+# http://graphics.cs.williams.edu/data
10
+# 
11
+
12
+

BIN
Samples/Data/meshes/CornellBox/water.mtl (Stored with Git LFS) View File

2
+oid sha256:0e1d922cfc2170663503555fa72ed14443644c31663b9dc72c1788b4d0d99ffa
3
+size 288

BIN
Samples/Data/meshes/CornellBox/water.obj (Stored with Git LFS) View File

2
+oid sha256:dc3728088f82cb34942520e2ed6ebc0b309211b42a3e112284417d5d52445eed
3
+size 159563

BIN
Samples/Data/meshes/Dragon/dragon.obj (Stored with Git LFS) View File

2
+oid sha256:aaf8d5b5196a821625f3e6b375366d61983ad66f41ab90c722f4268ced32ca3d
3
+size 74094075

+ 12
- 0
Samples/Data/meshes/MoriKnob/copyright.txt View File

@@ -0,0 +1,12 @@
1
+Open source model by Yasutoshi "Mirage" Mori
2
+Creative Commons Attribution 4.0 International License
3
+
4
+
5
+Blender source file available at:
6
+ https://github.com/lighttransport/lighttransportequation-orb
7
+
8
+Converted to OBJ and G3D format by Kenny Jones and Morgan McGuire
9
+ http://cs.williams.edu/~morgan
10
+
11
+Preview render by Syoyo Fujita
12
+ https://github.com/lighttransport/lighttransportequation-orb

BIN
Samples/Data/meshes/MoriKnob/testObj.mtl (Stored with Git LFS) View File

2
+oid sha256:3d21568c3f99b372f2220c7f4362394d3e689e1058489ea59589ebf4526cc10b
3
+size 549

BIN
Samples/Data/meshes/MoriKnob/testObj.obj (Stored with Git LFS) View File

2
+oid sha256:873cc970ae87eafa3b6b1bd35c3a4748e5cff445514475c90dbcb4671406ed51
3
+size 950884

+ 9
- 0
Samples/Data/meshes/MoriKnob/testObjSolo.ArticulatedModel.Any View File

@@ -0,0 +1,9 @@
1
+/* -*- c++ -*- */
2
+ArticulatedModel::Specification {
3
+    filename = "testObj.obj";
4
+    preprocess = {
5
+     	    removeMesh("LTELogo/LTELogo");
6
+	        removeMesh("Material/Material");
7
+            removeMesh("BackGroundMat/BackGroundMat");		
8
+    };
9
+}

+ 4
- 0
Samples/Data/meshes/MoriKnob/testObjWithBackground.ArticulatedModel.Any View File

@@ -0,0 +1,4 @@
1
+/* -*- c++ -*- */
2
+ArticulatedModel::Specification {
3
+filename = "testObj.obj";
4
+}

+ 25
- 0
Samples/Data/meshes/Sponza/copyright.txt View File

@@ -0,0 +1,25 @@
1
+July 14, 2011 Morgan McGuire modified the model from Crytek's OBJ
2
+export to correct some small errors.  He computed bump maps from the
3
+normal maps using <a
4
+href="http://cs.williams.edu/~morgan/code/">normal2bump.cpp</a> (since
5
+MTL files expect height bumps, not normals), put the "mask" textures
6
+into the alpha channel of the associated diffuse texture, cleaned up
7
+noise in the masks, created the missing gi_flag.tga texture, and
8
+removed the long untextured banner floating in the middle of the
9
+atrium that appears in the file but in none of the published images of
10
+the model.  The banner is in banner.obj.
11
+
12
+
13
+
14
+http://www.crytek.com/cryengine/cryengine3/downloads
15
+
16
+
17
+Sponza Model
18
+August 19, 2010
19
+The Atrium Sponza Palace, Dubrovnik, is an elegant and improved model created by Frank Meinl. The original Sponza model was created by Marko Dabrovic in early 2002. Over the years, the Sponza Atrium scene has become one of the most popular 3D scenes for testing global illumination and radiosity due to it's specific architectural structure which is particularly complex for global illumination light.
20
+
21
+However, nowadays it is considered as a simple model, thus it was decided to crate a new model with highly improved appearance and scene complexity. It is donated to the public for  radiosity and is represented in several different formats (3ds, Obj) for use with various commercial 3D applications and renderers.
22
+
23
+
24
+Screenshot from the I3D paper
25
+http://crytek.com/sites/default/files/20100301_lpv.pdf

BIN
Samples/Data/meshes/Sponza/sponza.mtl (Stored with Git LFS) View File

2
+oid sha256:7e5d765a00bf2af1c0cae1696051fdf04c5bb358cf2bc5cc2634ea8715669d9b
3
+size 6723

BIN
Samples/Data/meshes/Sponza/sponza.obj (Stored with Git LFS) View File

2
+oid sha256:dc9d77fa783772e92f47e67ddef8344858fa14e224711b5dd7d39f7db7042493
3
+size 21109957

Samples/Data/meshes/Car.obj → Samples/Data/meshes/car/Car.obj View File


Samples/Data/meshes/chalet.jpg → Samples/Data/meshes/chalet/chalet.jpg View File


Samples/Data/meshes/chalet.obj → Samples/Data/meshes/chalet/chalet.obj View File


Samples/Data/meshes/chalet.png → Samples/Data/meshes/chalet/chalet.png View File


+ 1
- 1
Samples/Mesh/Mesh.cpp View File

@@ -140,7 +140,7 @@ public:
140 140
 	{
141 141
 
142 142
 		DKLog("Loading Mesh");
143
-        DKString path = resourcePool.ResourceFilePath("meshes/chalet.obj");
143
+        DKString path = resourcePool.ResourceFilePath("meshes/chalet/chalet.obj");
144 144
 		SampleMesh->LoadFromObjFile(DKStringU8(path));
145 145
 	}
146 146