Merge pull request #1183 from MeridianOXC/normalize-line-endings

Normalize line endings

.astylerc

@@ -1,9 +1,9 @@
-style=allman
-indent=tab
-pad-oper
-pad-header
-unpad-paren
-fill-empty-lines
-add-brackets
-align-pointer=name
+style=allman
+indent=tab
+pad-oper
+pad-header
+unpad-paren
+fill-empty-lines
+add-brackets
+align-pointer=name
 mode=c

.gitattributes

@@ -0,0 +1,15 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.cpp text
+*.h text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=crlf
+*.vcxproj* text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.gif binary

.travis.yml

@@ -1,38 +1,38 @@
-language: cpp
-
-compiler:
-  - clang
-  - gcc
-
-os:
-  - linux
-  - osx
-
-sudo: false
-
-addons:
-  apt:
-    packages:
-      - cmake
-      - libsdl1.2-dev
-      - libsdl-mixer1.2-dev
-      - libsdl-image1.2-dev
-      - libsdl-gfx1.2-dev
-
-env:
-  - BUILD_TYPE=Debug EXTRA_WARNING_FLAGS="-Wall -Wextra"
-  - BUILD_TYPE=Release EXTRA_WARNING_FLAGS="-Wall -Wextra"
-
-before_install:
-  - if [ $TRAVIS_OS_NAME == osx ]; then brew install yaml-cpp sdl sdl_gfx sdl_image sdl_mixer --with-flac --with-libmikmod --with-libvorbis --with-static-lib; fi
-  - if [ $TRAVIS_OS_NAME == linux ]; then mkdir $TRAVIS_BUILD_DIR/dependency-prefix; fi
-  - if [ $TRAVIS_OS_NAME == linux ]; then export PKG_CONFIG_PATH=$TRAVIS_BUILD_DIR/dependency-prefix/lib/pkgconfig; fi
-
-install:
-  - if [ $TRAVIS_OS_NAME == linux ]; then mkdir -p $TRAVIS_BUILD_DIR/dependencies/; fi
-  - if [ $TRAVIS_OS_NAME == linux ]; then pushd $TRAVIS_BUILD_DIR/dependencies/ && git clone https://github.com/jbeder/yaml-cpp.git && pushd yaml-cpp && git checkout yaml-cpp-0.6.1 && cmake -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/dependency-prefix -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" -DYAML_CPP_BUILD_CONTRIB=NO -DYAML_CPP_BUILD_TOOLS=NO . && make -j2 && make install && popd && popd; fi
-
-before_script:
-  - cmake . -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" -DYAMLCPP_INCLUDE_DIR=$TRAVIS_BUILD_DIR/dependency-prefix/include -DCMAKE_CXX_FLAGS="${EXTRA_WARNING_FLAGS}" -DCMAKE_C_FLAGS="${EXTRA_WARNING_FLAGS}"
-
-script: make -j2
+language: cpp
+
+compiler:
+  - clang
+  - gcc
+
+os:
+  - linux
+  - osx
+
+sudo: false
+
+addons:
+  apt:
+    packages:
+      - cmake
+      - libsdl1.2-dev
+      - libsdl-mixer1.2-dev
+      - libsdl-image1.2-dev
+      - libsdl-gfx1.2-dev
+
+env:
+  - BUILD_TYPE=Debug EXTRA_WARNING_FLAGS="-Wall -Wextra"
+  - BUILD_TYPE=Release EXTRA_WARNING_FLAGS="-Wall -Wextra"
+
+before_install:
+  - if [ $TRAVIS_OS_NAME == osx ]; then brew install yaml-cpp sdl sdl_gfx sdl_image sdl_mixer --with-flac --with-libmikmod --with-libvorbis --with-static-lib; fi
+  - if [ $TRAVIS_OS_NAME == linux ]; then mkdir $TRAVIS_BUILD_DIR/dependency-prefix; fi
+  - if [ $TRAVIS_OS_NAME == linux ]; then export PKG_CONFIG_PATH=$TRAVIS_BUILD_DIR/dependency-prefix/lib/pkgconfig; fi
+
+install:
+  - if [ $TRAVIS_OS_NAME == linux ]; then mkdir -p $TRAVIS_BUILD_DIR/dependencies/; fi
+  - if [ $TRAVIS_OS_NAME == linux ]; then pushd $TRAVIS_BUILD_DIR/dependencies/ && git clone https://github.com/jbeder/yaml-cpp.git && pushd yaml-cpp && git checkout yaml-cpp-0.6.1 && cmake -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/dependency-prefix -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" -DYAML_CPP_BUILD_CONTRIB=NO -DYAML_CPP_BUILD_TOOLS=NO . && make -j2 && make install && popd && popd; fi
+
+before_script:
+  - cmake . -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" -DYAMLCPP_INCLUDE_DIR=$TRAVIS_BUILD_DIR/dependency-prefix/include -DCMAKE_CXX_FLAGS="${EXTRA_WARNING_FLAGS}" -DCMAKE_C_FLAGS="${EXTRA_WARNING_FLAGS}"
+
+script: make -j2

bin/common/Shaders/heavybloom.OpenGL.shader

@@ -1,57 +1,57 @@
-#<!--
-#WhateverMan's Bloom Shader
-#Copyright (c) 2010 WhateverMan
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public License
-#as published by the Free Software Foundation; either version 2
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#-->
-language: "GLSL"
-vertex: |
-      void main()
-      {
-         gl_Position    = ftransform();
-         gl_TexCoord[0] = gl_MultiTexCoord0;
-      }
-linear: false
-fragment: |
-      uniform sampler2D texture;
-      #define glarebasesize 0.42
-      #define power 0.50 // 0.50 is good
-
-      uniform vec2 rubyTextureSize;
-
-      void main()
-      {
-         vec4 sum = vec4(0.0);
-         vec4 bum = vec4(0.0);
-         vec2 texcoord = vec2(gl_TexCoord[0]);
-         int j;
-         int i;
-
-         vec2 glaresize = vec2(glarebasesize) / rubyTextureSize;
-
-         for(i = -2; i < 5; i++)
-         {
-            for (j = -1; j < 1; j++)
-            {
-               sum += texture2D(texture, texcoord + vec2(-i, j)*glaresize) * power;
-               bum += texture2D(texture, texcoord + vec2(j, i)*glaresize) * power;            
-            }
-         }
-
-         if (texture2D(texture, texcoord).r < 2.0)
-         {
-            gl_FragColor = sum*sum*sum*0.001+bum*bum*bum*0.0080 + texture2D(texture, texcoord);
-         }
-      }
+#<!--
+#WhateverMan's Bloom Shader
+#Copyright (c) 2010 WhateverMan
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#-->
+language: "GLSL"
+vertex: |
+      void main()
+      {
+         gl_Position    = ftransform();
+         gl_TexCoord[0] = gl_MultiTexCoord0;
+      }
+linear: false
+fragment: |
+      uniform sampler2D texture;
+      #define glarebasesize 0.42
+      #define power 0.50 // 0.50 is good
+
+      uniform vec2 rubyTextureSize;
+
+      void main()
+      {
+         vec4 sum = vec4(0.0);
+         vec4 bum = vec4(0.0);
+         vec2 texcoord = vec2(gl_TexCoord[0]);
+         int j;
+         int i;
+
+         vec2 glaresize = vec2(glarebasesize) / rubyTextureSize;
+
+         for(i = -2; i < 5; i++)
+         {
+            for (j = -1; j < 1; j++)
+            {
+               sum += texture2D(texture, texcoord + vec2(-i, j)*glaresize) * power;
+               bum += texture2D(texture, texcoord + vec2(j, i)*glaresize) * power;            
+            }
+         }
+
+         if (texture2D(texture, texcoord).r < 2.0)
+         {
+            gl_FragColor = sum*sum*sum*0.001+bum*bum*bum*0.0080 + texture2D(texture, texcoord);
+         }
+      }

bin/common/Shaders/simplebloom.OpenGL.shader

@@ -1,57 +1,57 @@
-#<!--
-#WhateverMan's Bloom Shader
-#Copyright (c) 2010 WhateverMan
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public License
-#as published by the Free Software Foundation; either version 2
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#-->
-language: "GLSL"
-vertex: |
-      void main()
-      {
-         gl_Position    = ftransform();
-         gl_TexCoord[0] = gl_MultiTexCoord0;
-      }
-linear: false
-fragment: |
-      uniform sampler2D texture;
-      #define glarebasesize 0.896
-      #define power 0.65 // 0.50 is good
-
-      uniform vec2 rubyTextureSize;
-
-      void main()
-      {
-         vec4 sum = vec4(0.0);
-         vec4 bum = vec4(0.0);
-         vec2 texcoord = vec2(gl_TexCoord[0]);
-         int j;
-         int i;
-
-         vec2 glaresize = vec2(glarebasesize) / rubyTextureSize;
-
-         for(i = -2; i < 2; i++)
-         {
-            for (j = -1; j < 1; j++)
-            {
-               sum += texture2D(texture, texcoord + vec2(-i, j)*glaresize) * power;
-               bum += texture2D(texture, texcoord + vec2(j, i)*glaresize) * power;            
-            }
-         }
-
-         if (texture2D(texture, texcoord).r < 2.0)
-         {
-            gl_FragColor = sum*sum*sum*0.001+bum*bum*bum*0.0080 + texture2D(texture, texcoord);
-         }
-      }
+#<!--
+#WhateverMan's Bloom Shader
+#Copyright (c) 2010 WhateverMan
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#-->
+language: "GLSL"
+vertex: |
+      void main()
+      {
+         gl_Position    = ftransform();
+         gl_TexCoord[0] = gl_MultiTexCoord0;
+      }
+linear: false
+fragment: |
+      uniform sampler2D texture;
+      #define glarebasesize 0.896
+      #define power 0.65 // 0.50 is good
+
+      uniform vec2 rubyTextureSize;
+
+      void main()
+      {
+         vec4 sum = vec4(0.0);
+         vec4 bum = vec4(0.0);
+         vec2 texcoord = vec2(gl_TexCoord[0]);
+         int j;
+         int i;
+
+         vec2 glaresize = vec2(glarebasesize) / rubyTextureSize;
+
+         for(i = -2; i < 2; i++)
+         {
+            for (j = -1; j < 1; j++)
+            {
+               sum += texture2D(texture, texcoord + vec2(-i, j)*glaresize) * power;
+               bum += texture2D(texture, texcoord + vec2(j, i)*glaresize) * power;            
+            }
+         }
+
+         if (texture2D(texture, texcoord).r < 2.0)
+         {
+            gl_FragColor = sum*sum*sum*0.001+bum*bum*bum*0.0080 + texture2D(texture, texcoord);
+         }
+      }