Line endings, windows fixes.

This commit is contained in:
Lubos Lenco 2016-10-25 13:01:20 +02:00
parent e50f60454e
commit 272b735ec0
119 changed files with 26 additions and 24 deletions

0
Assets/brdf.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
Assets/droid_sans.ttf Normal file → Executable file
View File

0
Assets/hosek/hosek_radiance.hdr Normal file → Executable file
View File

0
Assets/hosek/hosek_radiance_0.hdr Normal file → Executable file
View File

0
Assets/hosek/hosek_radiance_1.hdr Normal file → Executable file
View File

0
Assets/hosek/hosek_radiance_2.hdr Normal file → Executable file
View File

0
Assets/hosek/hosek_radiance_3.hdr Normal file → Executable file
View File

0
Assets/hosek/hosek_radiance_4.hdr Normal file → Executable file
View File

0
Assets/hosek/hosek_radiance_5.hdr Normal file → Executable file
View File

0
Assets/hosek/hosek_radiance_6.hdr Normal file → Executable file
View File

0
Assets/hosek/hosek_radiance_7.hdr Normal file → Executable file
View File

0
Assets/hosek_original/hosek_radiance.hdr Normal file → Executable file
View File

0
Assets/hosek_original/hosek_radiance_0.hdr Normal file → Executable file
View File

0
Assets/hosek_original/hosek_radiance_1.hdr Normal file → Executable file
View File

0
Assets/hosek_original/hosek_radiance_2.hdr Normal file → Executable file
View File

0
Assets/hosek_original/hosek_radiance_3.hdr Normal file → Executable file
View File

0
Assets/hosek_original/hosek_radiance_4.hdr Normal file → Executable file
View File

0
Assets/hosek_original/hosek_radiance_5.hdr Normal file → Executable file
View File

0
Assets/hosek_original/hosek_radiance_6.hdr Normal file → Executable file
View File

0
Assets/hosek_original/hosek_radiance_7.hdr Normal file → Executable file
View File

0
Assets/noise256.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

0
Assets/noise64.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

0
Assets/noise8.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
Assets/smaa_area.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
Assets/smaa_search.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 313 B

After

Width:  |  Height:  |  Size: 313 B

0
Shaders/bloom_pass/bloom_pass.frag.glsl Normal file → Executable file
View File

View File

0
Shaders/combine_pass/combine_pass.frag.glsl Normal file → Executable file
View File

9
Shaders/compositor_pass/compositor_pass.frag.glsl Normal file → Executable file
View File

@ -148,8 +148,7 @@ void main() {
vec3 rgbNE = texture(tex, tcrgbNE).rgb;
vec3 rgbSW = texture(tex, tcrgbSW).rgb;
vec3 rgbSE = texture(tex, tcrgbSE).rgb;
vec4 texColor = texture(tex, tcrgbM);
vec3 rgbM = texColor.rgb;
vec3 rgbM = texture(tex, tcrgbM).rgb;
vec3 luma = vec3(0.299, 0.587, 0.114);
float lumaNW = dot(rgbNW, luma);
float lumaNE = dot(rgbNE, luma);
@ -178,10 +177,10 @@ void main() {
texture(tex, texCo + dir * -0.5).rgb +
texture(tex, texCo + dir * 0.5).rgb);
vec4 col;
vec3 col;
float lumaB = dot(rgbB, luma);
if ((lumaB < lumaMin) || (lumaB > lumaMax)) col = vec4(rgbA, texColor.a);
else col = vec4(rgbB, texColor.a);
if ((lumaB < lumaMin) || (lumaB > lumaMax)) col = rgbA;
else col = rgbB;
#else

0
Shaders/debug_normals/debug_normals.frag.glsl Normal file → Executable file
View File

0
Shaders/deferred/decals.frag.glsl Normal file → Executable file
View File

0
Shaders/deferred/mesh.frag.glsl Normal file → Executable file
View File

0
Shaders/deferred/meshheight.vert.glsl Normal file → Executable file
View File

0
Shaders/deferred/shadowmapheight.tesc.glsl Normal file → Executable file
View File

0
Shaders/deferred/shadowmapheight.tese.glsl Normal file → Executable file
View File

0
Shaders/deferred/shadowmapheight.vert.glsl Normal file → Executable file
View File

0
Shaders/deferred/translucent.frag.glsl Normal file → Executable file
View File

0
Shaders/deferred_indirect/deferred_indirect.vert.glsl Normal file → Executable file
View File

0
Shaders/forward/mesh.vert.glsl Normal file → Executable file
View File

0
Shaders/fxaa_pass/fxaa_pass.frag.glsl Normal file → Executable file
View File

0
Shaders/grease_pencil/grease_pencil.frag.glsl Normal file → Executable file
View File

0
Shaders/grease_pencil/grease_pencil_shadows.vert.glsl Normal file → Executable file
View File

0
Shaders/include/lamp_volume.vert.glsl Normal file → Executable file
View File

0
Shaders/include/overlay.frag.glsl Normal file → Executable file
View File

0
Shaders/include/overlay.vert.glsl Normal file → Executable file
View File

0
Shaders/include/pass.vert.glsl Normal file → Executable file
View File

View File

0
Shaders/pt_trace_pass/pt_trace_pass.vert.glsl Normal file → Executable file
View File

0
Shaders/smaa_blend_weight/smaa_blend_weight.vert.glsl Normal file → Executable file
View File

View File

0
Shaders/ssao_pass/ssao_pass.frag.glsl Normal file → Executable file
View File

0
Shaders/ssdo_pass/ssdo_pass.frag.glsl Normal file → Executable file
View File

0
Shaders/ssr_pass/ssr_pass.frag.glsl Normal file → Executable file
View File

0
Shaders/sss_pass/sss_pass.frag.glsl Normal file → Executable file
View File

0
Shaders/taa_pass/taa_pass.frag.glsl Normal file → Executable file
View File

0
Shaders/water_pass/water_initial_spectrum.frag.glsl Normal file → Executable file
View File

0
Shaders/water_pass/water_phase.frag.glsl Normal file → Executable file
View File

0
Shaders/water_pass/water_spectrum.frag.glsl Normal file → Executable file
View File

0
Shaders/water_pass/water_subtransform.frag.glsl Normal file → Executable file
View File

0
Shaders/world/world.vert.glsl Normal file → Executable file
View File

0
Sources/armory/Scene.hx Normal file → Executable file
View File

0
Sources/armory/data/CameraData.hx Normal file → Executable file
View File

0
Sources/armory/data/ConstData.hx Normal file → Executable file
View File

0
Sources/armory/data/LampData.hx Normal file → Executable file
View File

0
Sources/armory/data/Mesh.hx Normal file → Executable file
View File

0
Sources/armory/data/RenderPath.hx Normal file → Executable file
View File

0
Sources/armory/data/ShaderData.hx Normal file → Executable file
View File

0
Sources/armory/data/WorldData.hx Normal file → Executable file
View File

0
Sources/armory/logicnode/GreaterThanNode.hx Normal file → Executable file
View File

0
Sources/armory/logicnode/PickerNode.hx Normal file → Executable file
View File

0
Sources/armory/logicnode/SetTransformNode.hx Normal file → Executable file
View File

0
Sources/armory/logicnode/SetVisibleNode.hx Normal file → Executable file
View File

0
Sources/armory/logicnode/StringNode.hx Normal file → Executable file
View File

0
Sources/armory/logicnode/ThisNode.hx Normal file → Executable file
View File

0
Sources/armory/logicnode/TimeNode.hx Normal file → Executable file
View File

0
Sources/armory/math/Quat.hx Normal file → Executable file
View File

0
Sources/armory/math/RayCaster.hx Normal file → Executable file
View File

0
Sources/armory/math/Vec4.hx Normal file → Executable file
View File

0
Sources/armory/object/CameraObject.hx Normal file → Executable file
View File

0
Sources/armory/object/LampObject.hx Normal file → Executable file
View File

0
Sources/armory/object/Object.hx Normal file → Executable file
View File

0
Sources/armory/object/Transform.hx Normal file → Executable file
View File

0
Sources/armory/system/Keymap.hx Normal file → Executable file
View File

0
Sources/armory/system/Time.hx Normal file → Executable file
View File

0
Sources/armory/system/Tween.hx Normal file → Executable file
View File

0
Sources/armory/system/VR.hx Normal file → Executable file
View File

0
Sources/armory/trait/FirstPersonController.hx Normal file → Executable file
View File

0
Sources/armory/trait/GunController.hx Normal file → Executable file
View File

0
Sources/armory/trait/MirrorTexture.hx Normal file → Executable file
View File

0
Sources/armory/trait/NavCrowd.hx Normal file → Executable file
View File

0
Sources/armory/trait/NavMesh.hx Normal file → Executable file
View File

0
Sources/armory/trait/PhysicsDrag.hx Normal file → Executable file
View File

0
Sources/armory/trait/SceneInstance.hx Normal file → Executable file
View File

0
Sources/armory/trait/ThirdPersonController.hx Normal file → Executable file
View File

0
Sources/armory/trait/VehicleBody.hx Normal file → Executable file
View File

0
Sources/armory/trait/WalkNavigation.hx Normal file → Executable file
View File

0
Sources/armory/trait/internal/CameraController.hx Normal file → Executable file
View File

0
Sources/armory/trait/internal/Console.hx Normal file → Executable file
View File

0
Sources/armory/trait/internal/EditorSpace.hx Normal file → Executable file
View File

0
Sources/armory/trait/internal/NodeExecutor.hx Normal file → Executable file
View File

Some files were not shown because too many files have changed in this diff Show More