From e80bf0ba92b2993a2811cdf117396da46f4a406c Mon Sep 17 00:00:00 2001 From: binary1248 Date: Wed, 1 Apr 2015 04:08:23 +0200 Subject: [PATCH] Fix whitespace: Convert tabs to spaces and remove trailing whitespace. --- CMakeLists.txt | 6 +- cmake/Modules/FindEGL.cmake | 2 +- cmake/Modules/FindGLES.cmake | 2 +- cmake/Modules/FindSFML.cmake | 4 +- cmake/Modules/FindUDev.cmake | 4 +- doc/CMakeLists.txt | 14 +-- doc/doxyfile.in | 110 +++++++++--------- doc/doxygen.css | 44 +++---- doc/mainpage.hpp | 20 ++-- examples/android/AndroidManifest.xml | 4 +- examples/android/jni/main.cpp | 2 +- examples/cocoa/CMakeLists.txt | 8 +- examples/cocoa/readme.txt | 6 +- examples/pong/Pong.cpp | 4 +- examples/shader/resources/blink.frag | 2 +- examples/shader/resources/blur.frag | 8 +- examples/shader/resources/edge.frag | 10 +- examples/shader/resources/pixelate.frag | 4 +- examples/shader/resources/storm.vert | 6 +- examples/shader/resources/wave.vert | 6 +- examples/sound/Sound.cpp | 2 +- examples/win32/Win32.cpp | 2 +- include/SFML/Audio.hpp | 2 +- include/SFML/Audio/Listener.hpp | 2 +- include/SFML/Graphics/BlendMode.hpp | 6 +- include/SFML/Graphics/Color.hpp | 2 +- include/SFML/Graphics/Sprite.hpp | 2 +- include/SFML/Graphics/Text.hpp | 4 +- include/SFML/Graphics/Transformable.hpp | 4 +- include/SFML/Graphics/View.hpp | 2 +- include/SFML/Network/UdpSocket.hpp | 2 +- include/SFML/System.hpp | 2 +- include/SFML/System/Lock.hpp | 14 +-- include/SFML/System/Mutex.hpp | 2 +- include/SFML/Window/Event.hpp | 8 +- include/SFML/Window/Sensor.hpp | 2 +- src/SFML/Audio/SoundBuffer.cpp | 2 +- src/SFML/Audio/SoundFileWriterFlac.cpp | 6 +- src/SFML/Graphics/Color.cpp | 2 +- src/SFML/Main/CMakeLists.txt | 2 +- src/SFML/Main/SFMLActivity.cpp | 4 +- src/SFML/System/Err.cpp | 4 +- src/SFML/Window/EglContext.cpp | 50 ++++---- src/SFML/Window/EglContext.hpp | 2 +- src/SFML/Window/Keyboard.cpp | 2 +- src/SFML/Window/OSX/InputImpl.mm | 2 +- src/SFML/Window/Sensor.cpp | 2 +- src/SFML/Window/SensorManager.hpp | 4 +- src/SFML/Window/iOS/SFView.mm | 6 +- tools/android/compile_libs.sh | 16 +-- tools/android/create_toolchains.sh | 66 +++++------ tools/android/download_sources.sh | 14 +-- tools/android/make_all.sh | 12 +- .../patches/remove-so-version-suffix.diff | 4 +- 54 files changed, 262 insertions(+), 262 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ce484b3c7..c395158a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,12 +91,12 @@ if(SFML_OS_ANDROID) if(NOT ANDROID_NDK) message(FATAL_ERROR "The Android NDK couldn't be found. Please adjust the CMake variable 'ANDROID_NDK' to point to the NDK directory.") endif() - + # CMake doesn't support defining the STL to be used with Nsight Tegra, so warn the user if(CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android") message(WARNING "CMake might not properly support setting the STL. Make sure to adjust all generated library projects!") endif() - + # install everything in $NDK/sources/ because this path is appended by the NDK (convenient) set(CMAKE_INSTALL_PREFIX ${ANDROID_NDK}/sources/sfml) @@ -107,7 +107,7 @@ if(SFML_OS_ANDROID) if (ANDROID_STL MATCHES "_shared") add_definitions("-DSTL_LIBRARY=${ANDROID_STL}") endif() - + # this is a workaround to compile sfml-activity without the stl library as a dependency # we save the original compilation command line to restore it later in Macro.cmake set(CMAKE_CXX_CREATE_SHARED_LIBRARY_WITH_STL ${CMAKE_CXX_CREATE_SHARED_LIBRARY}) diff --git a/cmake/Modules/FindEGL.cmake b/cmake/Modules/FindEGL.cmake index be9eda074..cde632ae1 100644 --- a/cmake/Modules/FindEGL.cmake +++ b/cmake/Modules/FindEGL.cmake @@ -9,6 +9,6 @@ find_path(EGL_INCLUDE_DIR EGL/egl.h) find_library(EGL_LIBRARY NAMES EGL) - + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR) diff --git a/cmake/Modules/FindGLES.cmake b/cmake/Modules/FindGLES.cmake index 948e9bf9c..f34f2cd0e 100644 --- a/cmake/Modules/FindGLES.cmake +++ b/cmake/Modules/FindGLES.cmake @@ -9,6 +9,6 @@ find_path(GLES_INCLUDE_DIR GLES/gl.h) find_library(GLES_LIBRARY NAMES GLESv1_CM) - + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GLES DEFAULT_MSG GLES_LIBRARY GLES_INCLUDE_DIR) diff --git a/cmake/Modules/FindSFML.cmake b/cmake/Modules/FindSFML.cmake index d1766b325..48873ef4a 100644 --- a/cmake/Modules/FindSFML.cmake +++ b/cmake/Modules/FindSFML.cmake @@ -181,7 +181,7 @@ foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS}) if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG OR SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE) # library found set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND TRUE) - + # if both are found, set SFML_XXX_LIBRARY to contain both if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE) set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY debug ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG} @@ -309,7 +309,7 @@ if(SFML_STATIC_LIBRARIES) # sfml-graphics list(FIND SFML_FIND_COMPONENTS "graphics" FIND_SFML_GRAPHICS_COMPONENT) if(NOT ${FIND_SFML_GRAPHICS_COMPONENT} EQUAL -1) - + # find libraries find_sfml_dependency(FREETYPE_LIBRARY "FreeType" freetype) find_sfml_dependency(JPEG_LIBRARY "libjpeg" jpeg) diff --git a/cmake/Modules/FindUDev.cmake b/cmake/Modules/FindUDev.cmake index e3c6e7087..9ae3cf807 100644 --- a/cmake/Modules/FindUDev.cmake +++ b/cmake/Modules/FindUDev.cmake @@ -29,9 +29,9 @@ IF (UDEV_LIBRARIES AND UDEV_INCLUDE_DIR) execute_process(COMMAND pkg-config --atleast-version=143 libudev RESULT_VARIABLE UDEV_STABLE) # retvale is 0 of the condition is "true" so we need to negate the value... if (UDEV_STABLE) - set(UDEV_STABLE 0) + set(UDEV_STABLE 0) else (UDEV_STABLE) - set(UDEV_STABLE 1) + set(UDEV_STABLE 1) endif (UDEV_STABLE) message(STATUS "libudev stable: ${UDEV_STABLE}") ENDIF (UDEV_LIBRARIES AND UDEV_INCLUDE_DIR) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 03cf1d2ae..df02266dc 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -2,14 +2,14 @@ # find doxygen if(SFML_OS_MACOSX) # Add some path to search doxygen in more directories. - set(ADDITIONAL_PATHS - /Developer/Applications/Doxygen.app/Contents/Resources - /Developer/Applications/Doxygen.app/Contents/MacOS - $ENV{HOME}/Applications/Doxygen.app/Contents/Resources - $ENV{HOME}/Applications/Doxygen.app/Contents/MacOS - $ENV{HOME}/Applications/Developer/Doxygen.app/Contents/Resources + set(ADDITIONAL_PATHS + /Developer/Applications/Doxygen.app/Contents/Resources + /Developer/Applications/Doxygen.app/Contents/MacOS + $ENV{HOME}/Applications/Doxygen.app/Contents/Resources + $ENV{HOME}/Applications/Doxygen.app/Contents/MacOS + $ENV{HOME}/Applications/Developer/Doxygen.app/Contents/Resources $ENV{HOME}/Applications/Developer/Doxygen.app/Contents/MacOS) - + set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${ADDITIONAL_PATHS}) endif() diff --git a/doc/doxyfile.in b/doc/doxyfile.in index 5611ac642..47622e6fb 100644 --- a/doc/doxyfile.in +++ b/doc/doxyfile.in @@ -44,14 +44,14 @@ PROJECT_NUMBER = @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ # for a project that appears at the top of each page and should give viewer a # quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = +PROJECT_BRIEF = # With the PROJECT_LOGO tag one can specify an logo or icon that is included in # the documentation. The maximum height of the logo should not exceed 55 pixels # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo # to the output directory. -PROJECT_LOGO = +PROJECT_LOGO = # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is @@ -162,7 +162,7 @@ FULL_PATH_NAMES = NO # will be relative from the directory where doxygen is started. # This tag requires that the tag FULL_PATH_NAMES is set to YES. -STRIP_FROM_PATH = +STRIP_FROM_PATH = # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the # path mentioned in the documentation of a class, which tells the reader which @@ -171,7 +171,7 @@ STRIP_FROM_PATH = # specify the list of include paths that are normally passed to the compiler # using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but # less readable) file names. This can be useful is your file systems doesn't @@ -238,13 +238,13 @@ TAB_SIZE = 4 # "Side Effects:". You can put \n's in the value part of an alias to insert # newlines. -ALIASES = +ALIASES = # This tag can be used to specify a number of word-keyword mappings (TCL only). # A mapping has the form "name=value". For example adding "class=itcl::class" # will allow you to use the command class in the itcl::class meaning. -TCL_SUBST = +TCL_SUBST = # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources # only. Doxygen will then generate output that is more tailored for C. For @@ -291,7 +291,7 @@ OPTIMIZE_OUTPUT_VHDL = NO # Note that for custom extensions you also need to set FILE_PATTERNS otherwise # the files are not read by doxygen. -EXTENSION_MAPPING = +EXTENSION_MAPPING = # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments # according to the Markdown format, which allows for more readable @@ -627,7 +627,7 @@ GENERATE_DEPRECATEDLIST= YES # sections, marked by \if ... \endif and \cond # ... \endcond blocks. -ENABLED_SECTIONS = +ENABLED_SECTIONS = # The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the # initial value of a variable or macro / define can have for it to appear in the @@ -669,7 +669,7 @@ SHOW_NAMESPACES = YES # by doxygen. Whatever the program writes to standard output is used as the file # version. For an example see the documentation. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed # by doxygen. The layout file controls the global structure of the generated @@ -682,7 +682,7 @@ FILE_VERSION_FILTER = # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE # tag is left empty. -LAYOUT_FILE = +LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib @@ -692,7 +692,7 @@ LAYOUT_FILE = # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. -CITE_BIB_FILES = +CITE_BIB_FILES = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages @@ -751,7 +751,7 @@ WARN_FORMAT = "$file:$line: $text" # messages should be written. If left blank the output is written to standard # error (stderr). -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- # Configuration options related to the input files @@ -799,7 +799,7 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = +EXCLUDE = # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded @@ -838,7 +838,7 @@ EXCLUDE_SYMBOLS = priv # that contain example code fragments that are included (see the \include # command). -EXAMPLE_PATH = +EXAMPLE_PATH = # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and @@ -858,7 +858,7 @@ EXAMPLE_RECURSIVE = NO # that contain images that are to be included in the documentation (see the # \image command). -IMAGE_PATH = +IMAGE_PATH = # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program @@ -875,7 +875,7 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. -INPUT_FILTER = +INPUT_FILTER = # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis. Doxygen will compare the file name with each pattern and apply the @@ -884,7 +884,7 @@ INPUT_FILTER = # filters are used. If the FILTER_PATTERNS tag is empty or if none of the # patterns match the file name, INPUT_FILTER is applied. -FILTER_PATTERNS = +FILTER_PATTERNS = # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using # INPUT_FILTER ) will also be used to filter the input files that are used for @@ -899,14 +899,14 @@ FILTER_SOURCE_FILES = NO # *.ext= (so without naming a filter). # This tag requires that the tag FILTER_SOURCE_FILES is set to YES. -FILTER_SOURCE_PATTERNS = +FILTER_SOURCE_PATTERNS = # If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that # is part of the input, its contents will be placed on the main page # (index.html). This can be useful if you have a project on for instance GitHub # and want to reuse the introduction page also for the doxygen output. -USE_MDFILE_AS_MAINPAGE = +USE_MDFILE_AS_MAINPAGE = #--------------------------------------------------------------------------- # Configuration options related to source browsing @@ -1013,7 +1013,7 @@ VERBATIM_HEADERS = YES # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. # Generates warnings with Clang -#CLANG_OPTIONS = +#CLANG_OPTIONS = #--------------------------------------------------------------------------- # Configuration options related to the alphabetical class index @@ -1039,7 +1039,7 @@ COLS_IN_ALPHA_INDEX = 5 # while generating the index headers. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the HTML output @@ -1122,7 +1122,7 @@ HTML_STYLESHEET = "@DOXYGEN_INPUT_DIR@/doc/doxygen.css" # list). For an example see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_EXTRA_STYLESHEET = +HTML_EXTRA_STYLESHEET = # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the HTML output directory. Note @@ -1132,7 +1132,7 @@ HTML_EXTRA_STYLESHEET = # files will be copied as-is; there are no commands or markers available. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_EXTRA_FILES = +HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the stylesheet and background images according to @@ -1281,7 +1281,7 @@ GENERATE_CHI = NO # and project file content. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. -CHM_INDEX_ENCODING = +CHM_INDEX_ENCODING = # The BINARY_TOC flag controls whether a binary table of contents is generated ( # YES) or a normal table of contents ( NO) in the .chm file. Furthermore it @@ -1312,7 +1312,7 @@ GENERATE_QHP = NO # the HTML output folder. # This tag requires that the tag GENERATE_QHP is set to YES. -QCH_FILE = +QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace @@ -1337,7 +1337,7 @@ QHP_VIRTUAL_FOLDER = doc # filters). # This tag requires that the tag GENERATE_QHP is set to YES. -QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom @@ -1345,21 +1345,21 @@ QHP_CUST_FILTER_NAME = # filters). # This tag requires that the tag GENERATE_QHP is set to YES. -QHP_CUST_FILTER_ATTRS = +QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: # http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. -QHP_SECT_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = # The QHG_LOCATION tag can be used to specify the location of Qt's # qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the # generated .qhp file. # This tag requires that the tag GENERATE_QHP is set to YES. -QHG_LOCATION = +QHG_LOCATION = # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be # generated, together with the HTML files, they form an Eclipse help plugin. To @@ -1492,7 +1492,7 @@ MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols # This tag requires that the tag USE_MATHJAX is set to YES. -MATHJAX_EXTENSIONS = +MATHJAX_EXTENSIONS = # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces # of code that will be used on startup of the MathJax code. See the MathJax site @@ -1500,7 +1500,7 @@ MATHJAX_EXTENSIONS = # example see the documentation. # This tag requires that the tag USE_MATHJAX is set to YES. -MATHJAX_CODEFILE = +MATHJAX_CODEFILE = # When the SEARCHENGINE tag is enabled doxygen will generate a search box for # the HTML output. The underlying search engine uses javascript and DHTML and @@ -1560,7 +1560,7 @@ EXTERNAL_SEARCH = NO # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. -SEARCHENGINE_URL = +SEARCHENGINE_URL = # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed # search data is written to a file for indexing by an external tool. With the @@ -1576,7 +1576,7 @@ SEARCHDATA_FILE = searchdata.xml # projects and redirect the results back to the right project. # This tag requires that the tag SEARCHENGINE is set to YES. -EXTERNAL_SEARCH_ID = +EXTERNAL_SEARCH_ID = # The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen # projects other than the one defined by this configuration file, but that are @@ -1586,7 +1586,7 @@ EXTERNAL_SEARCH_ID = # EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ... # This tag requires that the tag SEARCHENGINE is set to YES. -EXTRA_SEARCH_MAPPINGS = +EXTRA_SEARCH_MAPPINGS = #--------------------------------------------------------------------------- # Configuration options related to the LaTeX output @@ -1647,7 +1647,7 @@ PAPER_TYPE = a4 # If left blank no extra packages will be included. # This tag requires that the tag GENERATE_LATEX is set to YES. -EXTRA_PACKAGES = +EXTRA_PACKAGES = # The LATEX_HEADER tag can be used to specify a personal LaTeX header for the # generated LaTeX document. The header should contain everything until the first @@ -1663,7 +1663,7 @@ EXTRA_PACKAGES = # HTML_HEADER. # This tag requires that the tag GENERATE_LATEX is set to YES. -LATEX_HEADER = +LATEX_HEADER = # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the # generated LaTeX document. The footer should contain everything after the last @@ -1674,7 +1674,7 @@ LATEX_HEADER = # Note: Only use a user-defined footer if you know what you are doing! # This tag requires that the tag GENERATE_LATEX is set to YES. -LATEX_FOOTER = +LATEX_FOOTER = # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the LATEX_OUTPUT output @@ -1682,7 +1682,7 @@ LATEX_FOOTER = # markers available. # This tag requires that the tag GENERATE_LATEX is set to YES. -LATEX_EXTRA_FILES = +LATEX_EXTRA_FILES = # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is # prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will @@ -1782,14 +1782,14 @@ RTF_HYPERLINKS = NO # default style sheet that doxygen normally uses. # This tag requires that the tag GENERATE_RTF is set to YES. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = # Set optional variables used in the generation of an RTF document. Syntax is # similar to doxygen's config file. A template extensions file can be generated # using doxygen -e rtf extensionFile. # This tag requires that the tag GENERATE_RTF is set to YES. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # Configuration options related to the man page output @@ -1824,7 +1824,7 @@ MAN_EXTENSION = .3 # MAN_EXTENSION with the initial . removed. # This tag requires that the tag GENERATE_MAN is set to YES. -MAN_SUBDIR = +MAN_SUBDIR = # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it # will generate one additional man file for each entity documented in the real @@ -1937,7 +1937,7 @@ PERLMOD_PRETTY = YES # overwrite each other's variables. # This tag requires that the tag GENERATE_PERLMOD is set to YES. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the preprocessor @@ -1978,7 +1978,7 @@ SEARCH_INCLUDES = YES # preprocessor. # This tag requires that the tag SEARCH_INCLUDES is set to YES. -INCLUDE_PATH = +INCLUDE_PATH = # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the @@ -1986,7 +1986,7 @@ INCLUDE_PATH = # used. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = # The PREDEFINED tag can be used to specify one or more macro names that are # defined before the preprocessor is started (similar to the -D option of e.g. @@ -2009,7 +2009,7 @@ PREDEFINED = SFML_SYSTEM_API \ # definition found in the source code. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will # remove all references to function-like macros that are alone on a line, have @@ -2038,13 +2038,13 @@ SKIP_FUNCTION_MACROS = YES # the path). If a tag file is not located in the directory in which doxygen is # run, you must also specify the path to the tagfile here. -TAGFILES = +TAGFILES = # When a file name is specified after GENERATE_TAGFILE, doxygen will create a # tag file that is based on the input files it reads. See section "Linking to # external documentation" for more information about the usage of tag files. -GENERATE_TAGFILE = +GENERATE_TAGFILE = # If the ALLEXTERNALS tag is set to YES all external class will be listed in the # class index. If set to NO only the inherited external classes will be listed. @@ -2092,14 +2092,14 @@ CLASS_DIAGRAMS = YES # the mscgen tool resides. If left empty the tool is assumed to be found in the # default search path. -MSCGEN_PATH = +MSCGEN_PATH = # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. # If left empty dia is assumed to be found in the default search path. -DIA_PATH = +DIA_PATH = # If set to YES, the inheritance and collaboration graphs will hide inheritance # and usage relations if the target is undocumented or is not a class. @@ -2148,7 +2148,7 @@ DOT_FONTSIZE = 10 # the path where dot can find it using this tag. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTPATH = +DOT_FONTPATH = # If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for # each documented class showing the direct and indirect inheritance relations. @@ -2286,26 +2286,26 @@ INTERACTIVE_SVG = NO # found. If left blank, it is assumed the dot tool can be found in the path. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_PATH = +DOT_PATH = # The DOTFILE_DIRS tag can be used to specify one or more directories that # contain dot files that are included in the documentation (see the \dotfile # command). # This tag requires that the tag HAVE_DOT is set to YES. -DOTFILE_DIRS = +DOTFILE_DIRS = # The MSCFILE_DIRS tag can be used to specify one or more directories that # contain msc files that are included in the documentation (see the \mscfile # command). -MSCFILE_DIRS = +MSCFILE_DIRS = # The DIAFILE_DIRS tag can be used to specify one or more directories that # contain dia files that are included in the documentation (see the \diafile # command). -DIAFILE_DIRS = +DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the # path where java can find the plantuml.jar file. If left blank, it is assumed @@ -2314,7 +2314,7 @@ DIAFILE_DIRS = # will not generate output for the diagram. # This tag requires that the tag HAVE_DOT is set to YES. -PLANTUML_JAR_PATH = +PLANTUML_JAR_PATH = # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes # that will be shown in the graph. If the number of nodes in a graph becomes diff --git a/doc/doxygen.css b/doc/doxygen.css index 04e42cc5e..ed4e6e40a 100644 --- a/doc/doxygen.css +++ b/doc/doxygen.css @@ -233,7 +233,7 @@ p.formulaDsp { } img.formulaDsp { - + } img.formulaInl { @@ -291,20 +291,20 @@ span.charliteral { color: #008080 } -span.vhdldigit { - color: #ff00ff +span.vhdldigit { + color: #ff00ff } -span.vhdlchar { - color: #000000 +span.vhdlchar { + color: #000000 } -span.vhdlkeyword { - color: #700070 +span.vhdlkeyword { + color: #700070 } -span.vhdllogic { - color: #ff0000 +span.vhdllogic { + color: #ff0000 } blockquote { @@ -464,7 +464,7 @@ table.memberdecls { } .memdoc, dl.reflist dd { - border: 1px solid #A8B8D9; + border: 1px solid #A8B8D9; padding: 6px 10px 2px 10px; background-color: #FBFCFD; background-color: #FFFFFF; @@ -507,18 +507,18 @@ dl.reflist dd { .params, .retval, .exception, .tparams { margin-left: 0px; padding-left: 0px; -} +} .params .paramname, .retval .paramname { font-weight: bold; vertical-align: top; } - + .params .paramtype { font-style: italic; vertical-align: top; -} - +} + .params .paramdir { font-family: "courier new",courier,monospace; vertical-align: top; @@ -754,7 +754,7 @@ table.fieldtable { color: #283A5D; font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); - text-decoration: none; + text-decoration: none; } .navpath li.navelem a:hover { @@ -777,7 +777,7 @@ table.fieldtable { div.summary { font-size: 8pt; padding-right: 5px; -} +} div.summary a { white-space: nowrap; @@ -875,17 +875,17 @@ dl.section dd { vertical-align: bottom; border-collapse: separate; } - -#projectlogo img { + +#projectlogo img { border: 0px none; } - + #projectname { font: 300% Tahoma, Arial,sans-serif; margin: 0px; padding: 2px 0px; } - + #projectbrief { font: 120% Tahoma, Arial,sans-serif; margin: 0px; @@ -971,7 +971,7 @@ div.toc ul { list-style: none outside none; border: medium none; padding: 0px; -} +} div.toc li.level1 { margin-left: 0px; @@ -1022,7 +1022,7 @@ tr.heading h2 { h1, h2, h3, h4, h5, h6 { page-break-after: avoid; } .summary { display: none; } .memitem { page-break-inside: avoid; } - + #doc-content { margin-left:0 !important; height:auto !important; diff --git a/doc/mainpage.hpp b/doc/mainpage.hpp index ed6bea813..7ef4b6f1d 100644 --- a/doc/mainpage.hpp +++ b/doc/mainpage.hpp @@ -14,24 +14,24 @@ /// /// #include /// #include -/// +/// /// int main() /// { /// // Create the main window /// sf::RenderWindow window(sf::VideoMode(800, 600), "SFML window"); -/// +/// /// // Load a sprite to display /// sf::Texture texture; /// if (!texture.loadFromFile("cute_image.jpg")) /// return EXIT_FAILURE; /// sf::Sprite sprite(texture); -/// +/// /// // Create a graphical text to display /// sf::Font font; /// if (!font.loadFromFile("arial.ttf")) /// return EXIT_FAILURE; /// sf::Text text("Hello SFML", font, 50); -/// +/// /// // Load a music to play /// sf::Music music; /// if (!music.openFromFile("nice_music.ogg")) @@ -39,7 +39,7 @@ /// /// // Play the music /// music.play(); -/// +/// /// // Start the game loop /// while (window.isOpen()) /// { @@ -51,20 +51,20 @@ /// if (event.type == sf::Event::Closed) /// window.close(); /// } -/// +/// /// // Clear screen /// window.clear(); -/// +/// /// // Draw the sprite /// window.draw(sprite); -/// +/// /// // Draw the string /// window.draw(text); -/// +/// /// // Update the window /// window.display(); /// } -/// +/// /// return EXIT_SUCCESS; /// } /// \endcode diff --git a/examples/android/AndroidManifest.xml b/examples/android/AndroidManifest.xml index 3c97c0360..beb3538db 100644 --- a/examples/android/AndroidManifest.xml +++ b/examples/android/AndroidManifest.xml @@ -19,8 +19,8 @@ android:label="@string/app_name" android:icon="@drawable/sfml_logo" android:configChanges="keyboardHidden|orientation|screenSize"> - - + + diff --git a/examples/android/jni/main.cpp b/examples/android/jni/main.cpp index ee2c53709..a8e75de49 100644 --- a/examples/android/jni/main.cpp +++ b/examples/android/jni/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) } window.clear(sf::Color::White); - window.draw(image); + window.draw(image); window.display(); } } diff --git a/examples/cocoa/CMakeLists.txt b/examples/cocoa/CMakeLists.txt index 6eebf8f3d..5f67a1d40 100644 --- a/examples/cocoa/CMakeLists.txt +++ b/examples/cocoa/CMakeLists.txt @@ -26,7 +26,7 @@ set_source_files_properties(${RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) set_target_properties(cocoa PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${SRCROOT}/resources/Cocoa-Info.plist) -target_link_libraries(cocoa "-framework Cocoa -framework Foundation" +target_link_libraries(cocoa "-framework Cocoa -framework Foundation" sfml-system sfml-window sfml-graphics) # set the target's folder (for IDEs that support it, e.g. Visual Studio) @@ -42,10 +42,10 @@ set(XIB_OUTPUT_PATH "${RESOURCE_PATH}/") set(XIB_INPUT_PATH "${SRCROOT}/") foreach(XIB ${XIBS}) add_custom_command(TARGET cocoa - POST_BUILD + POST_BUILD COMMAND ${IBTOOL} --errors - --output-format human-readable-text - --compile ${XIB_OUTPUT_PATH}/${XIB}.nib + --output-format human-readable-text + --compile ${XIB_OUTPUT_PATH}/${XIB}.nib ${XIB_INPUT_PATH}/${XIB}.xib COMMENT "Compiling ${XIB}.xib") # deactivated options: --warnings --notices diff --git a/examples/cocoa/readme.txt b/examples/cocoa/readme.txt index 95c3d90e3..8636b1d8c 100644 --- a/examples/cocoa/readme.txt +++ b/examples/cocoa/readme.txt @@ -6,10 +6,10 @@ This is a small example of the integration of SFML in a Cocoa application. Features -------- - * This example shows how basic UI elements can interact with SFML - render areas such as sf::RenderWindow (you can use sf::Window and + * This example shows how basic UI elements can interact with SFML + render areas such as sf::RenderWindow (you can use sf::Window and OpenGL code too, of course). - * It also provides tools for converting NSString to and from + * It also provides tools for converting NSString to and from std::[w]string in an Objective-C Category of NSString. * Moreover, it shows how you can prevent annoying the system alerts produced when the SFML view has focus and the user press a key diff --git a/examples/pong/Pong.cpp b/examples/pong/Pong.cpp index b088e9922..e9edf231c 100644 --- a/examples/pong/Pong.cpp +++ b/examples/pong/Pong.cpp @@ -91,7 +91,7 @@ int main() while (window.pollEvent(event)) { // Window closed or escape key pressed: exit - if ((event.type == sf::Event::Closed) || + if ((event.type == sf::Event::Closed) || ((event.type == sf::Event::KeyPressed) && (event.key.code == sf::Keyboard::Escape))) { window.close(); @@ -188,7 +188,7 @@ int main() // Check the collisions between the ball and the paddles // Left Paddle - if (ball.getPosition().x - ballRadius < leftPaddle.getPosition().x + paddleSize.x / 2 && + if (ball.getPosition().x - ballRadius < leftPaddle.getPosition().x + paddleSize.x / 2 && ball.getPosition().x - ballRadius > leftPaddle.getPosition().x && ball.getPosition().y + ballRadius >= leftPaddle.getPosition().y - paddleSize.y / 2 && ball.getPosition().y - ballRadius <= leftPaddle.getPosition().y + paddleSize.y / 2) diff --git a/examples/shader/resources/blink.frag b/examples/shader/resources/blink.frag index 07c8ddb29..50a04a510 100644 --- a/examples/shader/resources/blink.frag +++ b/examples/shader/resources/blink.frag @@ -5,5 +5,5 @@ void main() { vec4 pixel = gl_Color; pixel.a = blink_alpha; - gl_FragColor = pixel; + gl_FragColor = pixel; } diff --git a/examples/shader/resources/blur.frag b/examples/shader/resources/blur.frag index 8d4261abc..b8aba3803 100644 --- a/examples/shader/resources/blur.frag +++ b/examples/shader/resources/blur.frag @@ -3,10 +3,10 @@ uniform float blur_radius; void main() { - vec2 offx = vec2(blur_radius, 0.0); - vec2 offy = vec2(0.0, blur_radius); + vec2 offx = vec2(blur_radius, 0.0); + vec2 offy = vec2(0.0, blur_radius); - vec4 pixel = texture2D(texture, gl_TexCoord[0].xy) * 4.0 + + vec4 pixel = texture2D(texture, gl_TexCoord[0].xy) * 4.0 + texture2D(texture, gl_TexCoord[0].xy - offx) * 2.0 + texture2D(texture, gl_TexCoord[0].xy + offx) * 2.0 + texture2D(texture, gl_TexCoord[0].xy - offy) * 2.0 + @@ -16,5 +16,5 @@ void main() texture2D(texture, gl_TexCoord[0].xy + offx - offy) * 1.0 + texture2D(texture, gl_TexCoord[0].xy + offx + offy) * 1.0; - gl_FragColor = gl_Color * (pixel / 16.0); + gl_FragColor = gl_Color * (pixel / 16.0); } diff --git a/examples/shader/resources/edge.frag b/examples/shader/resources/edge.frag index ad2cd8db0..7f869f534 100644 --- a/examples/shader/resources/edge.frag +++ b/examples/shader/resources/edge.frag @@ -4,17 +4,17 @@ uniform float edge_threshold; void main() { const float offset = 1.0 / 512.0; - vec2 offx = vec2(offset, 0.0); - vec2 offy = vec2(0.0, offset); + vec2 offx = vec2(offset, 0.0); + vec2 offy = vec2(0.0, offset); - vec4 hEdge = texture2D(texture, gl_TexCoord[0].xy - offy) * -2.0 + + vec4 hEdge = texture2D(texture, gl_TexCoord[0].xy - offy) * -2.0 + texture2D(texture, gl_TexCoord[0].xy + offy) * 2.0 + texture2D(texture, gl_TexCoord[0].xy - offx - offy) * -1.0 + texture2D(texture, gl_TexCoord[0].xy - offx + offy) * 1.0 + texture2D(texture, gl_TexCoord[0].xy + offx - offy) * -1.0 + texture2D(texture, gl_TexCoord[0].xy + offx + offy) * 1.0; - vec4 vEdge = texture2D(texture, gl_TexCoord[0].xy - offx) * 2.0 + + vec4 vEdge = texture2D(texture, gl_TexCoord[0].xy - offx) * 2.0 + texture2D(texture, gl_TexCoord[0].xy + offx) * -2.0 + texture2D(texture, gl_TexCoord[0].xy - offx - offy) * 1.0 + texture2D(texture, gl_TexCoord[0].xy - offx + offy) * -1.0 + @@ -28,5 +28,5 @@ void main() pixel.rgb = vec3(0.0, 0.0, 0.0); else pixel.a = edge_threshold; - gl_FragColor = pixel; + gl_FragColor = pixel; } diff --git a/examples/shader/resources/pixelate.frag b/examples/shader/resources/pixelate.frag index d8d01d01c..79f88683f 100644 --- a/examples/shader/resources/pixelate.frag +++ b/examples/shader/resources/pixelate.frag @@ -4,6 +4,6 @@ uniform float pixel_threshold; void main() { float factor = 1.0 / (pixel_threshold + 0.001); - vec2 pos = floor(gl_TexCoord[0].xy * factor + 0.5) / factor; - gl_FragColor = texture2D(texture, pos) * gl_Color; + vec2 pos = floor(gl_TexCoord[0].xy * factor + 0.5) / factor; + gl_FragColor = texture2D(texture, pos) * gl_Color; } diff --git a/examples/shader/resources/storm.vert b/examples/shader/resources/storm.vert index 442f80a9a..fab9da41b 100644 --- a/examples/shader/resources/storm.vert +++ b/examples/shader/resources/storm.vert @@ -13,7 +13,7 @@ void main() vertex.xy = storm_position + normalize(offset) * push_distance; } - gl_Position = gl_ProjectionMatrix * vertex; - gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; - gl_FrontColor = gl_Color; + gl_Position = gl_ProjectionMatrix * vertex; + gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; + gl_FrontColor = gl_Color; } diff --git a/examples/shader/resources/wave.vert b/examples/shader/resources/wave.vert index 5089cfbbd..278a53b45 100644 --- a/examples/shader/resources/wave.vert +++ b/examples/shader/resources/wave.vert @@ -9,7 +9,7 @@ void main() vertex.y += sin(gl_Vertex.x * 0.02 + wave_phase * 2.4) * wave_amplitude.y + cos(gl_Vertex.x * 0.02 + wave_phase * 5.2) * wave_amplitude.y * 0.3; - gl_Position = gl_ModelViewProjectionMatrix * vertex; - gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; - gl_FrontColor = gl_Color; + gl_Position = gl_ModelViewProjectionMatrix * vertex; + gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; + gl_FrontColor = gl_Color; } diff --git a/examples/sound/Sound.cpp b/examples/sound/Sound.cpp index 4de8946ce..b579fb573 100644 --- a/examples/sound/Sound.cpp +++ b/examples/sound/Sound.cpp @@ -90,7 +90,7 @@ int main() // Play music from an ogg file playMusic("orchestral.ogg"); - + // Play music from a flac file playMusic("ding.flac"); diff --git a/examples/win32/Win32.cpp b/examples/win32/Win32.cpp index 653ece7e2..aedfc76e3 100644 --- a/examples/win32/Win32.cpp +++ b/examples/win32/Win32.cpp @@ -50,7 +50,7 @@ LRESULT CALLBACK onEvent(HWND handle, UINT message, WPARAM wParam, LPARAM lParam int main() { HINSTANCE instance = GetModuleHandle(NULL); - + // Define a class for our main window WNDCLASS windowClass; windowClass.style = 0; diff --git a/include/SFML/Audio.hpp b/include/SFML/Audio.hpp index 02feb4472..41737cf83 100644 --- a/include/SFML/Audio.hpp +++ b/include/SFML/Audio.hpp @@ -52,5 +52,5 @@ /// /// Sounds, streaming (musics or custom sources), recording, /// spatialization. -/// +/// //////////////////////////////////////////////////////////// diff --git a/include/SFML/Audio/Listener.hpp b/include/SFML/Audio/Listener.hpp index 0a452dde0..04e4af3d8 100644 --- a/include/SFML/Audio/Listener.hpp +++ b/include/SFML/Audio/Listener.hpp @@ -210,7 +210,7 @@ public: /// audio environment, it defines where and how sounds and musics /// are heard. If sf::View is the eyes of the user, then sf::Listener /// is his ears (by the way, they are often linked together -- -/// same position, orientation, etc.). +/// same position, orientation, etc.). /// /// sf::Listener is a simple interface, which allows to setup the /// listener in the 3D audio environment (position, direction and diff --git a/include/SFML/Graphics/BlendMode.hpp b/include/SFML/Graphics/BlendMode.hpp index 3603c750d..7f5803beb 100644 --- a/include/SFML/Graphics/BlendMode.hpp +++ b/include/SFML/Graphics/BlendMode.hpp @@ -146,7 +146,7 @@ SFML_GRAPHICS_API bool operator !=(const BlendMode& left, const BlendMode& right //////////////////////////////////////////////////////////// // Commonly used blending modes //////////////////////////////////////////////////////////// -SFML_GRAPHICS_API extern const BlendMode BlendAlpha; ///< Blend source and dest according to dest alpha +SFML_GRAPHICS_API extern const BlendMode BlendAlpha; ///< Blend source and dest according to dest alpha SFML_GRAPHICS_API extern const BlendMode BlendAdd; ///< Add source to dest SFML_GRAPHICS_API extern const BlendMode BlendMultiply; ///< Multiply source and dest SFML_GRAPHICS_API extern const BlendMode BlendNone; ///< Overwrite dest with source @@ -164,7 +164,7 @@ SFML_GRAPHICS_API extern const BlendMode BlendNone; ///< Overwrite dest with /// sf::BlendMode is a class that represents a blend mode. A blend /// mode determines how the colors of an object you draw are /// mixed with the colors that are already in the buffer. -/// +/// /// The class is composed of 6 components, each of which has its /// own public member variable: /// \li %Color Source Factor (@ref colorSrcFactor) @@ -173,7 +173,7 @@ SFML_GRAPHICS_API extern const BlendMode BlendNone; ///< Overwrite dest with /// \li Alpha Source Factor (@ref alphaSrcFactor) /// \li Alpha Destination Factor (@ref alphaDstFactor) /// \li Alpha Blend Equation (@ref alphaEquation) -/// +/// /// The source factor specifies how the pixel you are drawing contributes /// to the final color. The destination factor specifies how the pixel /// already drawn in the buffer contributes to the final color. diff --git a/include/SFML/Graphics/Color.hpp b/include/SFML/Graphics/Color.hpp index 6469b3542..d32d59dad 100644 --- a/include/SFML/Graphics/Color.hpp +++ b/include/SFML/Graphics/Color.hpp @@ -68,7 +68,7 @@ public: /// //////////////////////////////////////////////////////////// explicit Color(Uint32 color); - + //////////////////////////////////////////////////////////// /// \brief Retrieve the color as a 32-bit unsigned integer /// diff --git a/include/SFML/Graphics/Sprite.hpp b/include/SFML/Graphics/Sprite.hpp index feec3ada0..a5e3b932a 100644 --- a/include/SFML/Graphics/Sprite.hpp +++ b/include/SFML/Graphics/Sprite.hpp @@ -262,7 +262,7 @@ private: /// // Declare and load a texture /// sf::Texture texture; /// texture.loadFromFile("texture.png"); -/// +/// /// // Create a sprite /// sf::Sprite sprite; /// sprite.setTexture(texture); diff --git a/include/SFML/Graphics/Text.hpp b/include/SFML/Graphics/Text.hpp index b3d669809..b753902c3 100644 --- a/include/SFML/Graphics/Text.hpp +++ b/include/SFML/Graphics/Text.hpp @@ -291,7 +291,7 @@ private: //////////////////////////////////////////////////////////// /// \brief Make sure the text's geometry is updated - /// + /// /// All the attributes related to rendering are cached, such /// that the geometry is only updated when necessary. /// @@ -356,7 +356,7 @@ private: /// // Declare and load a font /// sf::Font font; /// font.loadFromFile("arial.ttf"); -/// +/// /// // Create a text /// sf::Text text("hello", font); /// text.setCharacterSize(30); diff --git a/include/SFML/Graphics/Transformable.hpp b/include/SFML/Graphics/Transformable.hpp index 2e75054d7..e4b86cf3c 100644 --- a/include/SFML/Graphics/Transformable.hpp +++ b/include/SFML/Graphics/Transformable.hpp @@ -413,7 +413,7 @@ private: /// \endcode /// /// A note on coordinates and undistorted rendering: \n -/// By default, SFML (or more exactly, OpenGL) may interpolate drawable objects +/// By default, SFML (or more exactly, OpenGL) may interpolate drawable objects /// such as sprites or texts when rendering. While this allows transitions /// like slow movements or rotations to appear smoothly, it can lead to /// unwanted results in some cases, for example blurred or distorted objects. @@ -423,7 +423,7 @@ private: /// * The object's position, origin and scale have no fractional part /// * The object's and the view's rotation are a multiple of 90 degrees /// * The view's center and size have no fractional part -/// +/// /// \see sf::Transform /// //////////////////////////////////////////////////////////// diff --git a/include/SFML/Graphics/View.hpp b/include/SFML/Graphics/View.hpp index 312d1b2e5..4bd62d83a 100644 --- a/include/SFML/Graphics/View.hpp +++ b/include/SFML/Graphics/View.hpp @@ -313,7 +313,7 @@ private: /// \code /// sf::RenderWindow window; /// sf::View view; -/// +/// /// // Initialize the view to a rectangle located at (100, 100) and with a size of 400x200 /// view.reset(sf::FloatRect(100, 100, 400, 200)); /// diff --git a/include/SFML/Network/UdpSocket.hpp b/include/SFML/Network/UdpSocket.hpp index 1c991a81e..f00c257d8 100644 --- a/include/SFML/Network/UdpSocket.hpp +++ b/include/SFML/Network/UdpSocket.hpp @@ -207,7 +207,7 @@ private: /// stream of data (TCP). Therefore, one call to send will always /// match one call to receive (if the datagram is not lost), /// with the same data that was sent. -/// +/// /// The UDP protocol is lightweight but unreliable. Unreliable /// means that datagrams may be duplicated, be lost or /// arrive reordered. However, if a datagram arrives, its diff --git a/include/SFML/System.hpp b/include/SFML/System.hpp index 2de64e496..6af065277 100644 --- a/include/SFML/System.hpp +++ b/include/SFML/System.hpp @@ -56,5 +56,5 @@ /// Base module of SFML, defining various utilities. It provides /// vector classes, Unicode strings and conversion functions, /// threads and mutexes, timing classes. -/// +/// //////////////////////////////////////////////////////////// diff --git a/include/SFML/System/Lock.hpp b/include/SFML/System/Lock.hpp index 29d39f392..05dac108c 100644 --- a/include/SFML/System/Lock.hpp +++ b/include/SFML/System/Lock.hpp @@ -94,16 +94,16 @@ private: /// Usage example: /// \code /// sf::Mutex mutex; -/// +/// /// void function() /// { /// sf::Lock lock(mutex); // mutex is now locked -/// +/// /// functionThatMayThrowAnException(); // mutex is unlocked if this function throws -/// +/// /// if (someCondition) /// return; // mutex is unlocked -/// +/// /// } // mutex is unlocked /// \endcode /// @@ -116,15 +116,15 @@ private: /// /// \code /// sf::Mutex mutex; -/// +/// /// void function() /// { /// { /// sf::Lock lock(mutex); /// codeThatRequiresProtection(); -/// +/// /// } // mutex is unlocked here -/// +/// /// codeThatDoesntCareAboutTheMutex(); /// } /// \endcode diff --git a/include/SFML/System/Mutex.hpp b/include/SFML/System/Mutex.hpp index cb3263ab5..67a8473cd 100644 --- a/include/SFML/System/Mutex.hpp +++ b/include/SFML/System/Mutex.hpp @@ -119,7 +119,7 @@ private: /// database.write(...); /// mutex.unlock(); // if thread2 was waiting, it will now be unblocked /// } -/// +/// /// void thread2() /// { /// mutex.lock(); // this call will block the thread if the mutex is already locked by thread1 diff --git a/include/SFML/Window/Event.hpp b/include/SFML/Window/Event.hpp index c901e4dfc..5fc9a101d 100644 --- a/include/SFML/Window/Event.hpp +++ b/include/SFML/Window/Event.hpp @@ -174,10 +174,10 @@ public: //////////////////////////////////////////////////////////// struct SensorEvent { - Sensor::Type type; ///< Type of the sensor - float x; ///< Current value of the sensor on X axis - float y; ///< Current value of the sensor on Y axis - float z; ///< Current value of the sensor on Z axis + Sensor::Type type; ///< Type of the sensor + float x; ///< Current value of the sensor on X axis + float y; ///< Current value of the sensor on Y axis + float z; ///< Current value of the sensor on Z axis }; //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/Sensor.hpp b/include/SFML/Window/Sensor.hpp index 2057da7cc..350976fbf 100644 --- a/include/SFML/Window/Sensor.hpp +++ b/include/SFML/Window/Sensor.hpp @@ -72,7 +72,7 @@ public: //////////////////////////////////////////////////////////// /// \brief Enable or disable a sensor /// - /// All sensors are disabled by default, to avoid consuming too + /// All sensors are disabled by default, to avoid consuming too /// much battery power. Once a sensor is enabled, it starts /// sending events of the corresponding type. /// diff --git a/src/SFML/Audio/SoundBuffer.cpp b/src/SFML/Audio/SoundBuffer.cpp index d5873fa06..a6ff7ea52 100644 --- a/src/SFML/Audio/SoundBuffer.cpp +++ b/src/SFML/Audio/SoundBuffer.cpp @@ -70,7 +70,7 @@ SoundBuffer::~SoundBuffer() // called which removes the sound from the internal list. SoundList sounds; sounds.swap(m_sounds); - + // Detach the buffer from the sounds that use it (to avoid OpenAL errors) for (SoundList::const_iterator it = sounds.begin(); it != sounds.end(); ++it) (*it)->resetBuffer(); diff --git a/src/SFML/Audio/SoundFileWriterFlac.cpp b/src/SFML/Audio/SoundFileWriterFlac.cpp index 90b55a948..523689693 100644 --- a/src/SFML/Audio/SoundFileWriterFlac.cpp +++ b/src/SFML/Audio/SoundFileWriterFlac.cpp @@ -74,9 +74,9 @@ bool SoundFileWriterFlac::open(const std::string& filename, unsigned int sampleR } // Setup the encoder - FLAC__stream_encoder_set_channels(m_encoder, channelCount); - FLAC__stream_encoder_set_bits_per_sample(m_encoder, 16); - FLAC__stream_encoder_set_sample_rate(m_encoder, sampleRate); + FLAC__stream_encoder_set_channels(m_encoder, channelCount); + FLAC__stream_encoder_set_bits_per_sample(m_encoder, 16); + FLAC__stream_encoder_set_sample_rate(m_encoder, sampleRate); // Initialize the output stream if (FLAC__stream_encoder_init_file(m_encoder, filename.c_str(), NULL, NULL) != FLAC__STREAM_ENCODER_INIT_STATUS_OK) diff --git a/src/SFML/Graphics/Color.cpp b/src/SFML/Graphics/Color.cpp index b8b23bfc1..3fcec2322 100644 --- a/src/SFML/Graphics/Color.cpp +++ b/src/SFML/Graphics/Color.cpp @@ -81,7 +81,7 @@ a((color & 0x000000ff) >> 0 ) //////////////////////////////////////////////////////////// Uint32 Color::toInteger() { - return (r << 24) | (g << 16) | (b << 8) | a; + return (r << 24) | (g << 16) | (b << 8) | a; } diff --git a/src/SFML/Main/CMakeLists.txt b/src/SFML/Main/CMakeLists.txt index ac006c39a..d18ee4095 100644 --- a/src/SFML/Main/CMakeLists.txt +++ b/src/SFML/Main/CMakeLists.txt @@ -33,5 +33,5 @@ install(TARGETS sfml-main ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT devel) # from depending on shared libraries), we need a boostrap activity which # will load our shared libraries manually if(SFML_OS_ANDROID) - sfml_add_library(sfml-activity SOURCES ${PROJECT_SOURCE_DIR}/src/SFML/Main/SFMLActivity.cpp) + sfml_add_library(sfml-activity SOURCES ${PROJECT_SOURCE_DIR}/src/SFML/Main/SFMLActivity.cpp) endif() diff --git a/src/SFML/Main/SFMLActivity.cpp b/src/SFML/Main/SFMLActivity.cpp index bed7d2c4f..07602fb24 100644 --- a/src/SFML/Main/SFMLActivity.cpp +++ b/src/SFML/Main/SFMLActivity.cpp @@ -68,13 +68,13 @@ const char *getLibraryName(JNIEnv* lJNIEnv, jobject& objectActivityInfo) // Convert the application name to a C++ string and return it const jsize applicationNameLength = lJNIEnv->GetStringUTFLength(valueString); const char* applicationName = lJNIEnv->GetStringUTFChars(valueString, NULL); - + if (applicationNameLength >= 256) { LOGE("The value of 'sfml.app.lib_name' must not be longer than 255 characters."); exit(1); } - + strncpy(name, applicationName, applicationNameLength); name[applicationNameLength] = '\0'; lJNIEnv->ReleaseStringUTFChars(valueString, applicationName); diff --git a/src/SFML/System/Err.cpp b/src/SFML/System/Err.cpp index 4075f84e3..a7a408e0c 100644 --- a/src/SFML/System/Err.cpp +++ b/src/SFML/System/Err.cpp @@ -38,7 +38,7 @@ class DefaultErrStreamBuf : public std::streambuf { public: - DefaultErrStreamBuf() + DefaultErrStreamBuf() { // Allocate the write buffer static const int size = 64; @@ -46,7 +46,7 @@ public: setp(buffer, buffer + size); } - ~DefaultErrStreamBuf() + ~DefaultErrStreamBuf() { // Synchronize sync(); diff --git a/src/SFML/Window/EglContext.cpp b/src/SFML/Window/EglContext.cpp index b4182dd2b..ed7d2942e 100644 --- a/src/SFML/Window/EglContext.cpp +++ b/src/SFML/Window/EglContext.cpp @@ -47,15 +47,15 @@ namespace #if defined(SFML_SYSTEM_LINUX) static EGLDisplay display = EGL_NO_DISPLAY; - + if (display == EGL_NO_DISPLAY) { display = eglCheck(eglGetDisplay(EGL_DEFAULT_DISPLAY)); eglCheck(eglInitialize(display, NULL, NULL)); } - + return display; - + #elif defined(SFML_SYSTEM_ANDROID) // On Android, its native activity handles this for us @@ -63,7 +63,7 @@ namespace sf::Lock lock(states->mutex); return states->display; - + #endif } } @@ -85,10 +85,10 @@ m_config (NULL) // Get the best EGL config matching the default video settings m_config = getBestConfig(m_display, VideoMode::getDesktopMode().bitsPerPixel, ContextSettings()); - + // Note: The EGL specs say that attrib_list can be NULL when passed to eglCreatePbufferSurface, // but this is resulting in a segfault. Bug in Android? - EGLint attrib_list[] = { + EGLint attrib_list[] = { EGL_WIDTH, 1, EGL_HEIGHT,1, EGL_NONE @@ -120,15 +120,15 @@ m_config (NULL) // Get the initialized EGL display m_display = getInitializedDisplay(); - + // Get the best EGL config matching the requested video settings m_config = getBestConfig(m_display, bitsPerPixel, settings); - + // Create EGL context createContext(shared); - + #if !defined(SFML_SYSTEM_ANDROID) - // Create EGL surface (except on Android because the window is created + // Create EGL surface (except on Android because the window is created // asynchronously, its activity manager will call it for us) createSurface((EGLNativeWindowType)owner->getSystemHandle()); #endif @@ -199,7 +199,7 @@ void EglContext::createContext(EglContext* shared) EGL_CONTEXT_CLIENT_VERSION, 1, EGL_NONE }; - + EGLContext toShared; if (shared) @@ -243,13 +243,13 @@ EGLConfig EglContext::getBestConfig(EGLDisplay display, unsigned int bitsPerPixe EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT, EGL_NONE }; - + EGLint configCount; EGLConfig configs[1]; - + // Ask EGL for the best config matching our video settings eglCheck(eglChooseConfig(display, attributes, configs, 1, &configCount)); - + return configs[0]; } @@ -260,44 +260,44 @@ XVisualInfo EglContext::selectBestVisual(::Display* XDisplay, unsigned int bitsP { // Get the initialized EGL display EGLDisplay display = getInitializedDisplay(); - + // Get the best EGL config matching the default video settings EGLConfig config = getBestConfig(display, bitsPerPixel, settings); - + // Retrieve the visual id associated with this EGL config EGLint nativeVisualId; - + eglCheck(eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &nativeVisualId)); - + if (nativeVisualId == 0) { // Should never happen... err() << "No EGL visual found. You should check your graphics driver" << std::endl; - + return XVisualInfo(); } - + XVisualInfo vTemplate; vTemplate.visualid = static_cast(nativeVisualId); // Get X11 visuals compatible with this EGL config XVisualInfo *availableVisuals, bestVisual; int visualCount = 0; - + availableVisuals = XGetVisualInfo(XDisplay, VisualIDMask, &vTemplate, &visualCount); - + if (visualCount == 0) { // Can't happen... err() << "No X11 visual found. Bug in your EGL implementation ?" << std::endl; - + return XVisualInfo(); } - + // Pick up the best one bestVisual = availableVisuals[0]; XFree(availableVisuals); - + return bestVisual; } #endif diff --git a/src/SFML/Window/EglContext.hpp b/src/SFML/Window/EglContext.hpp index 50b366e20..ef30cb468 100644 --- a/src/SFML/Window/EglContext.hpp +++ b/src/SFML/Window/EglContext.hpp @@ -148,7 +148,7 @@ public: /// //////////////////////////////////////////////////////////// static EGLConfig getBestConfig(EGLDisplay display, unsigned int bitsPerPixel, const ContextSettings& settings); - + #ifdef SFML_SYSTEM_LINUX //////////////////////////////////////////////////////////// /// \brief Select the best EGL visual for a given set of settings diff --git a/src/SFML/Window/Keyboard.cpp b/src/SFML/Window/Keyboard.cpp index 1b554cbb7..6076122de 100644 --- a/src/SFML/Window/Keyboard.cpp +++ b/src/SFML/Window/Keyboard.cpp @@ -43,5 +43,5 @@ void Keyboard::setVirtualKeyboardVisible(bool visible) { priv::InputImpl::setVirtualKeyboardVisible(visible); } - + } // namespace sf diff --git a/src/SFML/Window/OSX/InputImpl.mm b/src/SFML/Window/OSX/InputImpl.mm index 1e5c701eb..f0e8ee440 100644 --- a/src/SFML/Window/OSX/InputImpl.mm +++ b/src/SFML/Window/OSX/InputImpl.mm @@ -87,7 +87,7 @@ SFOpenGLView* getSFOpenGLViewFromSFMLWindow(const Window& window) { sf::err() << "The content view is not a valid SFOpenGLView" << std::endl; - + view = nil; } } diff --git a/src/SFML/Window/Sensor.cpp b/src/SFML/Window/Sensor.cpp index 25faed513..64b9fff32 100644 --- a/src/SFML/Window/Sensor.cpp +++ b/src/SFML/Window/Sensor.cpp @@ -31,7 +31,7 @@ namespace sf { - + //////////////////////////////////////////////////////////// bool Sensor::isAvailable(Type sensor) { diff --git a/src/SFML/Window/SensorManager.hpp b/src/SFML/Window/SensorManager.hpp index 6dd1cbbc3..2d9f9c1e8 100644 --- a/src/SFML/Window/SensorManager.hpp +++ b/src/SFML/Window/SensorManager.hpp @@ -71,7 +71,7 @@ public: /// //////////////////////////////////////////////////////////// void setEnabled(Sensor::Type sensor, bool enabled); - + //////////////////////////////////////////////////////////// /// \brief Check if a sensor is enabled /// @@ -97,7 +97,7 @@ public: /// //////////////////////////////////////////////////////////// void update(); - + private: //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/iOS/SFView.mm b/src/SFML/Window/iOS/SFView.mm index 56c129c4c..b818749fb 100644 --- a/src/SFML/Window/iOS/SFView.mm +++ b/src/SFML/Window/iOS/SFView.mm @@ -171,7 +171,7 @@ //////////////////////////////////////////////////////////// + (Class)layerClass { - return [CAEAGLLayer class]; + return [CAEAGLLayer class]; } //////////////////////////////////////////////////////////// @@ -181,7 +181,7 @@ self.contentScaleFactor = factor; - if (self) + if (self) { self.context = NULL; self.touches = [NSMutableArray array]; @@ -199,7 +199,7 @@ self.multipleTouchEnabled = true; } - return self; + return self; } diff --git a/tools/android/compile_libs.sh b/tools/android/compile_libs.sh index dbd39146f..fa833fcd5 100755 --- a/tools/android/compile_libs.sh +++ b/tools/android/compile_libs.sh @@ -14,23 +14,23 @@ export LDFLAGS=$7 if [ "$1" = "arm" ] then - ARCH=arm-linux - ANDROID_ABI=armeabi + ARCH=arm-linux + ANDROID_ABI=armeabi elif [ "$1" = "arm-v7a" ] then - ARCH=arm-linux - ANDROID_ABI=armeabi-v7a + ARCH=arm-linux + ANDROID_ABI=armeabi-v7a elif [ "$1" = "x86" ] then - ARCH=i686-linux - ANDROID_ABI=x86 + ARCH=i686-linux + ANDROID_ABI=x86 elif [ "$1" = "mips" ] then - ARCH=mips-linux - ANDROID_ABI=mips + ARCH=mips-linux + ANDROID_ABI=mips fi HOST="--host=$ARCH" diff --git a/tools/android/create_toolchains.sh b/tools/android/create_toolchains.sh index dc6ed4e27..635d788eb 100755 --- a/tools/android/create_toolchains.sh +++ b/tools/android/create_toolchains.sh @@ -2,43 +2,43 @@ create_toolchain () { - # abort if already created - if [ -d "$PWD/toolchains/$2" ] - then - return - fi - - # save the working directory and move to the NDK directory - WORKING_DIRECTORY=$PWD - cd $NDK + # abort if already created + if [ -d "$PWD/toolchains/$2" ] + then + return + fi - # prepare the command according to chosen options - PLATFORM=--platform=android-$1 - DIR=--install-dir=$WORKING_DIRECTORY/toolchains/$2 - MAKE=$NDK/build/tools/make-standalone-toolchain.sh + # save the working directory and move to the NDK directory + WORKING_DIRECTORY=$PWD + cd $NDK - if [ "$2" = "arm" ] - then - TOOLCHAIN=--toolchain=arm-linux-androideabi-4.8 - elif [ "$2" = "x86" ] - then - TOOLCHAIN=--toolchain=x86-4.8 - elif [ "$2" = "mips" ] - then - TOOLCHAIN=--toolchain=mipsel-linux-android-4.8 - else - echo "Abort." - exit 1 - fi + # prepare the command according to chosen options + PLATFORM=--platform=android-$1 + DIR=--install-dir=$WORKING_DIRECTORY/toolchains/$2 + MAKE=$NDK/build/tools/make-standalone-toolchain.sh - # create the standalone toolchain - $MAKE $PLATFORM $TOOLCHAIN $DIR --stl=libc++ + if [ "$2" = "arm" ] + then + TOOLCHAIN=--toolchain=arm-linux-androideabi-4.8 + elif [ "$2" = "x86" ] + then + TOOLCHAIN=--toolchain=x86-4.8 + elif [ "$2" = "mips" ] + then + TOOLCHAIN=--toolchain=mipsel-linux-android-4.8 + else + echo "Abort." + exit 1 + fi - # go back to our working directory - cd $WORKING_DIRECTORY - - # move linux/soundcard.h to sys/soundcard.h - mv $PWD/toolchains/$2/sysroot/usr/include/linux/soundcard.h $PWD/toolchains/$2/sysroot/usr/include/sys + # create the standalone toolchain + $MAKE $PLATFORM $TOOLCHAIN $DIR --stl=libc++ + + # go back to our working directory + cd $WORKING_DIRECTORY + + # move linux/soundcard.h to sys/soundcard.h + mv $PWD/toolchains/$2/sysroot/usr/include/linux/soundcard.h $PWD/toolchains/$2/sysroot/usr/include/sys } create_toolchain 9 arm diff --git a/tools/android/download_sources.sh b/tools/android/download_sources.sh index 2fc56a3df..b85e77667 100755 --- a/tools/android/download_sources.sh +++ b/tools/android/download_sources.sh @@ -22,43 +22,43 @@ mkdir build wget -nc -P src http://downloads.xiph.org/releases/flac/$FLAC.tar.gz if [ ! -d "$PWD/tmp/$FLAC" ] then - tar -C build -xf src/$FLAC.tar.gz + tar -C build -xf src/$FLAC.tar.gz fi wget -nc -P src http://downloads.xiph.org/releases/vorbis/$VORBIS.tar.gz if [ ! -d "$PWD/tmp/$VORBIS" ] then - tar -C build -xf src/$VORBIS.tar.gz + tar -C build -xf src/$VORBIS.tar.gz fi wget -nc -P src http://downloads.xiph.org/releases/ogg/$OGG.tar.gz if [ ! -d "$PWD/tmp/$OGG" ] then - tar -C build -xf src/$OGG.tar.gz + tar -C build -xf src/$OGG.tar.gz fi wget -nc -P src http://www.mega-nerd.com/libsndfile/files/$SNDFILE.tar.gz if [ ! -d "$PWD/tmp/$SNDFILE" ] then - tar -C build -xf src/$SNDFILE.tar.gz + tar -C build -xf src/$SNDFILE.tar.gz fi wget -nc -P src http://www.ijg.org/files/jpegsrc.v$JPEG_VERSION.tar.gz if [ ! -d "$PWD/tmp/$JPEG" ] then - tar -C build -xf src/jpegsrc.v$JPEG_VERSION.tar.gz + tar -C build -xf src/jpegsrc.v$JPEG_VERSION.tar.gz fi wget -nc -P src http://download.savannah.gnu.org/releases/freetype/$FREETYPE.tar.gz if [ ! -d "$PWD/tmp/$FREETYPE" ] then - tar -C build -xf src/$FREETYPE.tar.gz + tar -C build -xf src/$FREETYPE.tar.gz fi wget -nc -P src https://github.com/AerialX/openal-soft-android/archive/master.tar.gz if [ ! -d "$PWD/tmp/openal-soft-android-master" ] then - tar -C build -xf src/master.tar.gz + tar -C build -xf src/master.tar.gz fi patch build/openal-soft-android-master/CMakeLists.txt patches/remove-so-version-suffix.diff diff --git a/tools/android/make_all.sh b/tools/android/make_all.sh index 2281aa2d0..d7d3517d4 100755 --- a/tools/android/make_all.sh +++ b/tools/android/make_all.sh @@ -3,9 +3,9 @@ # Abort if no known installation of NDK if [ "$NDK" == "" ] then - echo "Where is the NDK location ?" - echo -n "NDK: "; read NDK - export NDK=$NDK + echo "Where is the NDK location ?" + echo -n "NDK: "; read NDK + export NDK=$NDK fi export ANDROID_NDK=$NDK @@ -13,9 +13,9 @@ export ANDROID_NDK=$NDK # Abort if we don't know the Android CMake toolchain location if [ "$ANDROID_CMAKE_TOOLCHAIN" == "" ] then - echo "Where is the Android CMake toolchain ?" - echo -n "ANDROID_CMAKE_TOOLCHAIN: "; read ANDROID_CMAKE_TOOLCHAIN - export ANDROID_CMAKE_TOOLCHAIN=$ANDROID_CMAKE_TOOLCHAIN + echo "Where is the Android CMake toolchain ?" + echo -n "ANDROID_CMAKE_TOOLCHAIN: "; read ANDROID_CMAKE_TOOLCHAIN + export ANDROID_CMAKE_TOOLCHAIN=$ANDROID_CMAKE_TOOLCHAIN fi ./clean_all.sh diff --git a/tools/android/patches/remove-so-version-suffix.diff b/tools/android/patches/remove-so-version-suffix.diff index 257d553dd..60b980589 100644 --- a/tools/android/patches/remove-so-version-suffix.diff +++ b/tools/android/patches/remove-so-version-suffix.diff @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2013-09-21 15:23:49.305453804 +0200 -+++ CMakeLists.txt 2013-09-21 15:24:08.621454210 +0200 +--- CMakeLists.txt.orig 2013-09-21 15:23:49.305453804 +0200 ++++ CMakeLists.txt 2013-09-21 15:24:08.621454210 +0200 @@ -717,9 +717,7 @@ # Build a library ADD_LIBRARY(${LIBNAME} ${LIBTYPE} ${OPENAL_OBJS} ${ALC_OBJS})