Browse Source

fix : license clearing

change mesh chalet to viking
Heedong Lee 3 years ago
parent
commit
47aa6f1dec

+ 1
- 0
Samples/Data/meshes/Dragon/LICENSE.txt View File

1
+Stanford Scan : http://www.graphics.stanford.edu/data/3Dscanrep/

+ 5
- 0
Samples/Data/meshes/VikingRoom/Copyright.txt View File

1
+Open source model by nigelgoh
2
+Creative Commons Attribution 4.0 International License
3
+
4
+Original Source : https://sketchfab.com/3d-models/viking-room-a49f1b8e4f5c4ecf9e1fe7d81915ad38
5
+

BIN
Samples/Data/meshes/VikingRoom/viking_room.obj (Stored with Git LFS) View File

2
+oid sha256:0af27cd99ce43f48c89d9c73cff47cbdfc3d29c3754b29bd0ccfe7e3fe7de869
3
+size 479536

BIN
Samples/Data/meshes/VikingRoom/viking_room.png (Stored with Git LFS) View File

2
+oid sha256:f6589538b20ecd707afa9cd9e24ca288f8199de36e1d3c9e7ff09f296c26af9b
3
+size 1074965

BIN
Samples/Data/meshes/chalet/chalet.jpg (Stored with Git LFS) View File

2
-oid sha256:44eb03bd983abc03b617474bddec1d26eb52c8f8101624a748cc64860e8c8e6b
3
-size 3056003

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

2
-oid sha256:38a4c1f87162da4bb7000160fca57aae7450a261cca1ef5e9fb35dd519ffdf9b
3
-size 33200100

BIN
Samples/Data/meshes/chalet/chalet.png (Stored with Git LFS) View File

2
-oid sha256:7facbad7f0415d7acaeec333e04c0b6be88dce1b8cc847a24c34b92ea5c378fc
3
-size 19292996

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

140
 	{
140
 	{
141
 
141
 
142
 		DKLog("Loading Mesh");
142
 		DKLog("Loading Mesh");
143
-        DKString path = resourcePool.ResourceFilePath("meshes/car/car.obj");
143
+        DKString path = resourcePool.ResourceFilePath("meshes/VikingRoom/viking_room.obj");
144
 		SampleMesh->LoadFromObjFile(DKStringU8(path));
144
 		SampleMesh->LoadFromObjFile(DKStringU8(path));
145
 	}
145
 	}
146
 
146
 
202
         DKObject<DKCommandQueue> queue = device->CreateCommandQueue(DKCommandQueue::Graphics);
202
         DKObject<DKCommandQueue> queue = device->CreateCommandQueue(DKCommandQueue::Graphics);
203
 
203
 
204
 		// create texture
204
 		// create texture
205
-		DKObject<DKTexture> texture = LoadTexture2D(queue, resourcePool.LoadResourceData("meshes/chalet/chalet.png"));
205
+		DKObject<DKTexture> texture = LoadTexture2D(queue, resourcePool.LoadResourceData("meshes/VikingRoom/viking_room.png"));
206
 		// create sampler
206
 		// create sampler
207
 		DKSamplerDescriptor samplerDesc = {};
207
 		DKSamplerDescriptor samplerDesc = {};
208
 		samplerDesc.magFilter = DKSamplerDescriptor::MinMagFilterLinear;
208
 		samplerDesc.magFilter = DKSamplerDescriptor::MinMagFilterLinear;