salmon-engine-projects/double-hit-balls
14
0 Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: salmon-engine-projects/double-hit-balls:fabric-vlad1
salmon-engine-projects/double-hit-balls:master salmon-engine-projects/double-hit-balls:gl-reinit salmon-engine-projects/double-hit-balls:release-bug salmon-engine-projects/double-hit-balls:dev salmon-engine-projects/double-hit-balls:fabric-ilshat salmon-engine-projects/double-hit-balls:parallax-test salmon-engine-projects/double-hit-balls:antialiasing-demo1 salmon-engine-projects/double-hit-balls:head-pose-estimation salmon-engine-projects/double-hit-balls:fabric salmon-engine-projects/double-hit-balls:fabric-vlad1 salmon-engine-projects/double-hit-balls:antialiasing-smaa salmon-engine-projects/double-hit-balls:particles salmon-engine-projects/double-hit-balls:antialiasing-test salmon-engine-projects/double-hit-balls:post-processing
...
pull from: salmon-engine-projects/double-hit-balls:fabric
salmon-engine-projects/double-hit-balls:gl-reinit salmon-engine-projects/double-hit-balls:master salmon-engine-projects/double-hit-balls:release-bug salmon-engine-projects/double-hit-balls:dev salmon-engine-projects/double-hit-balls:fabric-ilshat salmon-engine-projects/double-hit-balls:parallax-test salmon-engine-projects/double-hit-balls:antialiasing-demo1 salmon-engine-projects/double-hit-balls:head-pose-estimation salmon-engine-projects/double-hit-balls:fabric salmon-engine-projects/double-hit-balls:fabric-vlad1 salmon-engine-projects/double-hit-balls:antialiasing-smaa salmon-engine-projects/double-hit-balls:particles salmon-engine-projects/double-hit-balls:antialiasing-test salmon-engine-projects/double-hit-balls:post-processing
2 Commits
fabric-vlad1 ... fabric
Author SHA1 Message Date
vladislav.khorev 3f2572eaa5 Change height map and normal map 2018-01-22 01:00:58 +03:00
vladislav.khorev 86f0ad59bb Change height map and normal map 2018-01-22 00:37:11 +03:00
3 changed files with 16 additions and 13 deletions
Expand all files Collapse all files

No files matched your search

assets/HeightMap.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 696 KiB

assets/NormalMap.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 2.5 MiB

game/main_code.cpp
+16 -13
View File
@@ -86,9 +86,13 @@ void TMyApplication::InnerInit()
ResourceManager->FrameManager.AddFrameRenderBuffer("LevelBuffer", 512, 512);
Vector2f const bottomLeft(-1000, -1000);
float const W = 2000;
float const H = 2000;
Vector2f const bottomLeft(-500, -500);
float const W = 1000;
float const H = 1000;
Vector2f const backgroundBottomLeft(-1000, -1000);
float const backgroundW = 2000;
float const backgroundH = 2000;
{
//resolution of background image
@@ -96,16 +100,16 @@ void TMyApplication::InnerInit()
float const imageH = 512;
background.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].emplace_back(Vector3f(bottomLeft[0], 0, bottomLeft[1]));
background.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].emplace_back(Vector3f(bottomLeft[0], 0, bottomLeft[1] + H));
background.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].emplace_back(Vector3f(bottomLeft[0] + W, 0, bottomLeft[1] + H));
background.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].emplace_back(Vector3f(backgroundBottomLeft[0], 0, backgroundBottomLeft[1]));
background.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].emplace_back(Vector3f(backgroundBottomLeft[0], 0, backgroundBottomLeft[1] + backgroundH));
background.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].emplace_back(Vector3f(backgroundBottomLeft[0] + backgroundW, 0, backgroundBottomLeft[1] + backgroundH));
background.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].emplace_back(Vector3f(bottomLeft[0] + W, 0, bottomLeft[0] + H));
background.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].emplace_back(Vector3f(bottomLeft[0] + W, 0, bottomLeft[0]));
background.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].emplace_back(Vector3f(bottomLeft[0], 0, bottomLeft[0]));
background.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].emplace_back(Vector3f(backgroundBottomLeft[0] + backgroundW, 0, backgroundBottomLeft[0] + backgroundH));
background.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].emplace_back(Vector3f(backgroundBottomLeft[0] + backgroundW, 0, backgroundBottomLeft[0]));
background.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].emplace_back(Vector3f(backgroundBottomLeft[0], 0, backgroundBottomLeft[0]));
float const tw = W / imageW;
float const th = H / imageH;
float const tw = backgroundW / imageW;
float const th = backgroundH / imageH;
background.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].emplace_back(Vector2f(0, th));
background.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].emplace_back(Vector2f(0, 0));
@@ -115,7 +119,6 @@ void TMyApplication::InnerInit()
background.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].emplace_back(Vector2f(tw, th));
background.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].emplace_back(Vector2f(0, th));
background.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].emplace_back(Vector4f(1, 1, 1, 1));
background.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].emplace_back(Vector4f(1, 1, 1, 1));
background.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].emplace_back(Vector4f(1, 1, 1, 1));
@@ -179,7 +182,7 @@ void TMyApplication::InnerInit()
}
background.first.ShaderName ="ParallaxShader";
background.first.ShaderName ="DefaultShader";
fabricRender.first.ShaderName = "ParallaxShader";
/*