EpicSparrow/SparrowEngine
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.epicsparrow.com/EpicSparrow/SparrowEngine

Browse Source
This commit is contained in:
Lendemor 2017-08-19 16:48:35 +02:00
commit a6bb3e5769
13 changed files with 1 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deploy/data/ambient/1_posX.tga
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45812db95bd21535b6a14db30c949d67aa39545b9dd1866c103da6b74e1c62b1
size 49196

3
deploy/data/ambient/2_negX.tga
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:daf58d6d059395121cfff3340645b1790fce56c988d5414b29d393e5f64c90cc
size 49196

3
deploy/data/ambient/3_posY.tga
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:904069dc6c60ed9823d6379827fe6434b3a05a7331631a508f6f4b96eb208a7a
size 49196

3
deploy/data/ambient/4_negY.tga
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f4864454868b3c5b7625e82584e6a28adb1b8727e96266984c4dfc23850f25d
size 49196

3
deploy/data/ambient/5_posZ.tga
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:08a8539cdb09329b5404e2aef67265c4bade0d7761474cd650450d94cb2b9493
size 49196

3
deploy/data/ambient/6_negZ.tga
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d835a097cb53d3e43ffb3e4be852c2047c8fdfed8c9d8eb218cefb2147bf3f74
size 49196

3
deploy/data/skybox/1_posX.tga
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:936d3c5ea0589cb0600ae0d7116cafd2792e025055e0a3b7eb4ecfda2291e93b
size 12582930

3
deploy/data/skybox/2_negX.tga
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:68288c1a11df99056d5009ddf67accc5f52677ceff0c990152ef4b643ee2e8c4
size 12582930

3
deploy/data/skybox/3_posY.tga
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4ce096e0ce8da69464a183c9d80ea9e7937b4e960ef2774237f2a6ade2bddf50
size 241711

3
deploy/data/skybox/4_negY.tga
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7bce18ac878bf0df16f9a55d881ab076a074c257b7c24f40249ddd77d43d36c6
size 2848272

3
deploy/data/skybox/5_posZ.tga
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:58192d9fa5dcbc58884d90db48469197561b4b8d49d7a39c71b4521743fdc4b2
size 12582930

3
deploy/data/skybox/6_negZ.tga
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:087883d665611ebec43e4b3e10abb10595a40bdd1084dbd350c1f0b4f59f542e
size 12582930

21
src/test/main.cpp
View File

@ -207,7 +207,7 @@ public:
LightNode *ambientLight = new LightNode(new AmbientLight(ambientTexture, skyboxTexture));
DeferredPipeline* pipeline = dynamic_cast<DeferredPipeline*>(scene->getPipeline());
pipeline->setSkybox(RESOURCE_GET(Texture, "craterlake"));
pipeline->setSkybox(RESOURCE_GET(Texture, "skybox"));
DirectionnalLight* sun = new DirectionnalLight(glm::vec3(5, 8, -2), glm::vec3(0.9f));
LightNode *sunLight = new LightNode(sun);
@ -328,26 +328,7 @@ int main(){
imgs[3] = Loader::loadImage("skybox/craterlake_dn.tga", 24, false); // bottom
imgs[4] = Loader::loadImage("skybox/craterlake_ft.tga", 24, false); // front
imgs[5] = Loader::loadImage("skybox/craterlake_bk.tga", 24, false); // back
RESOURCE_ADD(new Texture(imgs), Texture, "craterlake");
for(int i=0; i<6; ++i)
delete imgs[i];
imgs[0] = Loader::loadImage("skybox/1_posX.tga", 24, false); // right
imgs[1] = Loader::loadImage("skybox/2_negX.tga", 24, false); // left
imgs[2] = Loader::loadImage("skybox/3_posY.tga", 24, false); // top
imgs[3] = Loader::loadImage("skybox/4_negY.tga", 24, false); // bottom
imgs[4] = Loader::loadImage("skybox/5_posZ.tga", 24, false); // front
imgs[5] = Loader::loadImage("skybox/6_negZ.tga", 24, false); // back
RESOURCE_ADD(new Texture(imgs), Texture, "skybox");
for(int i=0; i<6; ++i)
delete imgs[i];
imgs[0] = Loader::loadImage("ambient/1_posX.tga", 24, false); // right
imgs[1] = Loader::loadImage("ambient/2_negX.tga", 24, false); // left
imgs[2] = Loader::loadImage("ambient/3_posY.tga", 24, false); // top
imgs[3] = Loader::loadImage("ambient/4_negY.tga", 24, false); // bottom
imgs[4] = Loader::loadImage("ambient/5_posZ.tga", 24, false); // front
imgs[5] = Loader::loadImage("ambient/6_negZ.tga", 24, false); // back
RESOURCE_ADD(new Texture(imgs), Texture, "ambient");
for(int i=0; i<6; ++i)
delete imgs[i];