sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/HardwareInfo: Fix indentation (Windows) 

Former-commit-id: 7ba2d1623489a77445c5f687b329fffd8f85bfc0 [formerly 670207d53279fa6ff6a63ee0c701ac5691b3073c] [formerly 214e08cdb6fa4abe6289c139b62211a806f7545b [formerly 1774090b940bb9046ed51fcb70e7fc89e490cc67]]
Former-commit-id: a6ebc85ef52dece75daf2dbd95b73cfad48e957c [formerly 00b7ddd2874d348d452ae8fd0bd668b90b7c4bcd]
Former-commit-id: e9dd53029407209f3210cd47b16e1e0070e1ccfd
This commit is contained in:
Lynix 2016-08-31 18:20:23 +02:00
parent 3abaa6e508
commit 85b2f41667
4 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Nazara/Core/Win32/HardwareInfoImpl.cpp
View File

@ -76,25 +76,25 @@ namespace Nz
#elif defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL) #elif defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL)
int supported; int supported;
asm volatile (" pushfl\n" asm volatile (" pushfl\n"
" pop %%eax\n" " pop %%eax\n"
" mov %%eax, %%ecx\n" " mov %%eax, %%ecx\n"
" xor $0x200000, %%eax\n" " xor $0x200000, %%eax\n"
" push %%eax\n" " push %%eax\n"
" popfl\n" " popfl\n"
" pushfl\n" " pushfl\n"
" pop %%eax\n" " pop %%eax\n"
" xor %%ecx, %%eax\n" " xor %%ecx, %%eax\n"
" mov %%eax, %0\n" " mov %%eax, %0\n"
" push %%ecx\n" " push %%ecx\n"
" popfl" " popfl"
: "=m" (supported) // output : "=m" (supported) // output
: // input : // input
: "eax", "ecx", "memory"); // clobbered register : "eax", "ecx", "memory"); // clobbered register
return supported != 0; return supported != 0;
#else #else
return false; return false;
#endif #endif
#endif #endif
} }
} }

18
src/Nazara/Graphics/Resources/DeferredShading/Shaders/LightScatteringFinal.frag Normal file
View File

@ -0,0 +1,18 @@
#version 140
out vec4 RenderTarget0;
uniform float exposure = 0.92;
uniform sampler2D AccumulationTexture;
uniform sampler2D ColorTexture;
uniform vec2 InvTargetSize;
void main()
{
vec2 texCoord = gl_FragCoord.xy * InvTargetSize;
vec4 color = texture(ColorTexture, texCoord);
vec4 lightScattering = texture(AccumulationTexture, texCoord);
RenderTarget0 = vec4(lightScattering.rgb * exposure, 1.0) + color * 1.1;
}

1
src/Nazara/Graphics/Resources/DeferredShading/Shaders/LightScatteringFinal.frag.h Normal file
View File

@ -0,0 +1 @@
35,118,101,114,115,105,111,110,32,49,52,48,13,10,13,10,111,117,116,32,118,101,99,52,32,82,101,110,100,101,114,84,97,114,103,101,116,48,59,13,10,13,10,117,110,105,102,111,114,109,32,102,108,111,97,116,32,101,120,112,111,115,117,114,101,32,61,32,48,46,57,50,59,13,10,117,110,105,102,111,114,109,32,115,97,109,112,108,101,114,50,68,32,65,99,99,117,109,117,108,97,116,105,111,110,84,101,120,116,117,114,101,59,13,10,117,110,105,102,111,114,109,32,115,97,109,112,108,101,114,50,68,32,67,111,108,111,114,84,101,120,116,117,114,101,59,13,10,117,110,105,102,111,114,109,32,118,101,99,50,32,73,110,118,84,97,114,103,101,116,83,105,122,101,59,13,10,13,10,118,111,105,100,32,109,97,105,110,40,41,13,10,123,13,10,9,118,101,99,50,32,116,101,120,67,111,111,114,100,32,61,32,103,108,95,70,114,97,103,67,111,111,114,100,46,120,121,32,42,32,73,110,118,84,97,114,103,101,116,83,105,122,101,59,13,10,13,10,9,118,101,99,52,32,99,111,108,111,114,32,61,32,116,101,120,116,117,114,101,40,67,111,108,111,114,84,101,120,116,117,114,101,44,32,116,101,120,67,111,111,114,100,41,59,13,10,9,118,101,99,52,32,108,105,103,104,116,83,99,97,116,116,101,114,105,110,103,32,61,32,116,101,120,116,117,114,101,40,65,99,99,117,109,117,108,97,116,105,111,110,84,101,120,116,117,114,101,44,32,116,101,120,67,111,111,114,100,41,59,13,10,13,10,9,82,101,110,100,101,114,84,97,114,103,101,116,48,32,61,32,118,101,99,52,40,108,105,103,104,116,83,99,97,116,116,101,114,105,110,103,46,114,103,98,32,42,32,101,120,112,111,115,117,114,101,44,32,49,46,48,41,32,43,32,99,111,108,111,114,32,42,32,49,46,49,59,13,10,125,13,10,

10
src/Nazara/Graphics/Sprite.cpp
View File

@ -57,20 +57,22 @@ namespace Nz
SparsePtr<Vector3f> posPtr(&vertices[0].position, sizeof(VertexStruct_XYZ_Color_UV)); SparsePtr<Vector3f> posPtr(&vertices[0].position, sizeof(VertexStruct_XYZ_Color_UV));
SparsePtr<Vector2f> texCoordPtr(&vertices[0].uv, sizeof(VertexStruct_XYZ_Color_UV)); SparsePtr<Vector2f> texCoordPtr(&vertices[0].uv, sizeof(VertexStruct_XYZ_Color_UV));
const Nz::Vector3f origin(m_size.x / 2.f, m_size.y / -2.f, 0.f);
*colorPtr++ = m_color; *colorPtr++ = m_color;
*posPtr++ = instanceData->transformMatrix->Transform(Vector3f(0.f)); *posPtr++ = instanceData->transformMatrix->Transform(Vector3f(-origin));
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftTop); *texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftTop);
*colorPtr++ = m_color; *colorPtr++ = m_color;
*posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right()); *posPtr++ = instanceData->transformMatrix->Transform(-origin + m_size.x*Vector3f::Right());
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightTop); *texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightTop);
*colorPtr++ = m_color; *colorPtr++ = m_color;
*posPtr++ = instanceData->transformMatrix->Transform(m_size.y*Vector3f::Down()); *posPtr++ = instanceData->transformMatrix->Transform(-origin + m_size.y*Vector3f::Down());
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftBottom); *texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftBottom);
*colorPtr++ = m_color; *colorPtr++ = m_color;
*posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down()); *posPtr++ = instanceData->transformMatrix->Transform(-origin + m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down());
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightBottom); *texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightBottom);
} }