n'gine 0.6.1-a

- Incorporados los archivos DLL necesarios para las utilidades de la librería en su versión para Windows. - Añadida la sobrecarga al método NGN_Sound::OpenMusic() que nos permite escoger los puntos de entrada y salida del LOOP. - Añadido el ejemplo de loop de música cambiando los puntos de loop.
knightfox75 · Jul 9, 2018 · 1e56ae9 · 1e56ae9
1 parent 4be6f89
commit 1e56ae9
Show file tree

Hide file tree

Showing 148 changed files with 1,282 additions and 164 deletions.
diff --git a/Docs/changelog.txt b/Docs/changelog.txt
@@ -2,6 +2,15 @@
 N'gine Changelog
 --------------------------------------------------------------------------------
 
+2018-07-09 Ver.0.6.1-a
+--------------------------------------------------------------------------------
+- Incorporados los archivos DLL necesarios para las utilidades de la librer�a
+  en su versi�n para Windows.
+- A�adida la sobrecarga al m�todo NGN_Sound::OpenMusic() que nos permite
+  escoger los puntos de entrada y salida del LOOP.
+- A�adido el ejemplo de loop de m�sica cambiando los puntos de loop.
+
+
 2018-05-31 Ver.0.6.0-a
 --------------------------------------------------------------------------------
   [Windows]

diff --git a/Docs/user manual.esp/ngn_sound.h.pdf b/Docs/user manual.esp/ngn_sound.h.pdf
diff --git a/Examples/camera/camera.cbp b/Examples/camera/camera.cbp
@@ -107,8 +107,6 @@
 			<Add option="-m64" />
 		</Compiler>
 		<Linker>
-			<Add option="-static-libstdc++" />
-			<Add option="-static-libgcc" />
 			<Add option="-m64" />
 		</Linker>
 		<Unit filename="resource/recource.rc">

diff --git a/Examples/canvas_effects/canvas_effects.cbp b/Examples/canvas_effects/canvas_effects.cbp
@@ -107,8 +107,6 @@
 			<Add option="-m64" />
 		</Compiler>
 		<Linker>
-			<Add option="-static-libstdc++" />
-			<Add option="-static-libgcc" />
 			<Add option="-m64" />
 		</Linker>
 		<Unit filename="resource/recource.rc">

diff --git a/Examples/canvas_forms/canvas_forms.cbp b/Examples/canvas_forms/canvas_forms.cbp
@@ -107,8 +107,6 @@
 			<Add option="-m64" />
 		</Compiler>
 		<Linker>
-			<Add option="-static-libstdc++" />
-			<Add option="-static-libgcc" />
 			<Add option="-m64" />
 		</Linker>
 		<Unit filename="resource/recource.rc">

diff --git a/Examples/canvas_paint/canvas_paint.cbp b/Examples/canvas_paint/canvas_paint.cbp
@@ -108,8 +108,6 @@
 			<Add option="-m64" />
 		</Compiler>
 		<Linker>
-			<Add option="-static-libstdc++" />
-			<Add option="-static-libgcc" />
 			<Add option="-m64" />
 		</Linker>
 		<Unit filename="resource/recource.rc">

diff --git a/Examples/collisions/collisions.cbp b/Examples/collisions/collisions.cbp
@@ -107,8 +107,6 @@
 			<Add option="-m64" />
 		</Compiler>
 		<Linker>
-			<Add option="-static-libstdc++" />
-			<Add option="-static-libgcc" />
 			<Add option="-m64" />
 		</Linker>
 		<Unit filename="resource/recource.rc">

diff --git a/Examples/hitbox/hitbox.cbp b/Examples/hitbox/hitbox.cbp
@@ -107,8 +107,6 @@
 			<Add option="-m64" />
 		</Compiler>
 		<Linker>
-			<Add option="-static-libstdc++" />
-			<Add option="-static-libgcc" />
 			<Add option="-m64" />
 		</Linker>
 		<Unit filename="resource/recource.rc">

diff --git a/Examples/load_texture/load_texture.cbp b/Examples/load_texture/load_texture.cbp
@@ -107,8 +107,6 @@
 			<Add option="-m64" />
 		</Compiler>
 		<Linker>
-			<Add option="-static-libstdc++" />
-			<Add option="-static-libgcc" />
 			<Add option="-m64" />
 		</Linker>
 		<Unit filename="resource/recource.rc">

diff --git a/Examples/move_texture/move_texture.cbp b/Examples/move_texture/move_texture.cbp
@@ -107,8 +107,6 @@
 			<Add option="-m64" />
 		</Compiler>
 		<Linker>
-			<Add option="-static-libstdc++" />
-			<Add option="-static-libgcc" />
 			<Add option="-m64" />
 		</Linker>
 		<Unit filename="resource/recource.rc">

diff --git a/Examples/music_loop/LICENSE.SDL.txt b/Examples/music_loop/LICENSE.SDL.txt
@@ -0,0 +1,13 @@
+
+Please distribute this file with the SDL runtime environment:
+
+The Simple DirectMedia Layer (SDL for short) is a cross-platform library
+designed to make it easy to write multi-media software, such as games
+and emulators.
+
+The Simple DirectMedia Layer library source code is available from:
+https://www.libsdl.org/
+
+This library is distributed under the terms of the zlib license:
+http://www.zlib.net/zlib_license.html
+
diff --git a/Examples/music_loop/LICENSE.SDL2_ttf.txt b/Examples/music_loop/LICENSE.SDL2_ttf.txt
@@ -0,0 +1,22 @@
+This library is distributed under the terms of the zlib license:
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+Portions of this software are copyright © 2013 The FreeType Project (www.freetype.org).  All rights reserved.
+
+The source is available from the SDL website:
+http://www.libsdl.org/projects/SDL_ttf
diff --git a/Examples/music_loop/LICENSE.freetype.txt b/Examples/music_loop/LICENSE.freetype.txt
@@ -0,0 +1,173 @@
+The source code to this library used with SDL_ttf can be found here:
+http://www.libsdl.org/projects/SDL_ttf/libs/
+---
+
+                    The FreeType Project LICENSE
+                    ----------------------------
+
+                            2006-Jan-27
+
+                    Copyright 1996-2002, 2006 by
+          David Turner, Robert Wilhelm, and Werner Lemberg
+
+
+
+Introduction
+============
+
+  The FreeType  Project is distributed in  several archive packages;
+  some of them may contain, in addition to the FreeType font engine,
+  various tools and  contributions which rely on, or  relate to, the
+  FreeType Project.
+
+  This  license applies  to all  files found  in such  packages, and
+  which do not  fall under their own explicit  license.  The license
+  affects  thus  the  FreeType   font  engine,  the  test  programs,
+  documentation and makefiles, at the very least.
+
+  This  license   was  inspired  by  the  BSD,   Artistic,  and  IJG
+  (Independent JPEG  Group) licenses, which  all encourage inclusion
+  and  use of  free  software in  commercial  and freeware  products
+  alike.  As a consequence, its main points are that:
+
+    o We don't promise that this software works. However, we will be
+      interested in any kind of bug reports. (`as is' distribution)
+
+    o You can  use this software for whatever you  want, in parts or
+      full form, without having to pay us. (`royalty-free' usage)
+
+    o You may not pretend that  you wrote this software.  If you use
+      it, or  only parts of it,  in a program,  you must acknowledge
+      somewhere  in  your  documentation  that  you  have  used  the
+      FreeType code. (`credits')
+
+  We  specifically  permit  and  encourage  the  inclusion  of  this
+  software, with  or without modifications,  in commercial products.
+  We  disclaim  all warranties  covering  The  FreeType Project  and
+  assume no liability related to The FreeType Project.
+
+
+  Finally,  many  people  asked  us  for  a  preferred  form  for  a
+  credit/disclaimer to use in compliance with this license.  We thus
+  encourage you to use the following text:
+
+   """
+    Portions of this software are copyright � <year> The FreeType
+    Project (www.freetype.org).  All rights reserved.
+   """
+
+  Please replace <year> with the value from the FreeType version you
+  actually use.
+
+
+Legal Terms
+===========
+
+0. Definitions
+--------------
+
+  Throughout this license,  the terms `package', `FreeType Project',
+  and  `FreeType  archive' refer  to  the  set  of files  originally
+  distributed  by the  authors  (David Turner,  Robert Wilhelm,  and
+  Werner Lemberg) as the `FreeType Project', be they named as alpha,
+  beta or final release.
+
+  `You' refers to  the licensee, or person using  the project, where
+  `using' is a generic term including compiling the project's source
+  code as  well as linking it  to form a  `program' or `executable'.
+  This  program is  referred to  as  `a program  using the  FreeType
+  engine'.
+
+  This  license applies  to all  files distributed  in  the original
+  FreeType  Project,   including  all  source   code,  binaries  and
+  documentation,  unless  otherwise  stated   in  the  file  in  its
+  original, unmodified form as  distributed in the original archive.
+  If you are  unsure whether or not a particular  file is covered by
+  this license, you must contact us to verify this.
+
+  The FreeType  Project is copyright (C) 1996-2000  by David Turner,
+  Robert Wilhelm, and Werner Lemberg.  All rights reserved except as
+  specified below.
+
+1. No Warranty
+--------------
+
+  THE FREETYPE PROJECT  IS PROVIDED `AS IS' WITHOUT  WARRANTY OF ANY
+  KIND, EITHER  EXPRESS OR IMPLIED,  INCLUDING, BUT NOT  LIMITED TO,
+  WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR
+  PURPOSE.  IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE  FOR ANY DAMAGES CAUSED  BY THE USE OR  THE INABILITY TO
+  USE, OF THE FREETYPE PROJECT.
+
+2. Redistribution
+-----------------
+
+  This  license  grants  a  worldwide, royalty-free,  perpetual  and
+  irrevocable right  and license to use,  execute, perform, compile,
+  display,  copy,   create  derivative  works   of,  distribute  and
+  sublicense the  FreeType Project (in  both source and  object code
+  forms)  and  derivative works  thereof  for  any  purpose; and  to
+  authorize others  to exercise  some or all  of the  rights granted
+  herein, subject to the following conditions:
+
+    o Redistribution of  source code  must retain this  license file
+      (`FTL.TXT') unaltered; any  additions, deletions or changes to
+      the original  files must be clearly  indicated in accompanying
+      documentation.   The  copyright   notices  of  the  unaltered,
+      original  files must  be  preserved in  all  copies of  source
+      files.
+
+    o Redistribution in binary form must provide a  disclaimer  that
+      states  that  the software is based in part of the work of the
+      FreeType Team,  in  the  distribution  documentation.  We also
+      encourage you to put an URL to the FreeType web page  in  your
+      documentation, though this isn't mandatory.
+
+  These conditions  apply to any  software derived from or  based on
+  the FreeType Project,  not just the unmodified files.   If you use
+  our work, you  must acknowledge us.  However, no  fee need be paid
+  to us.
+
+3. Advertising
+--------------
+
+  Neither the  FreeType authors and  contributors nor you  shall use
+  the name of the  other for commercial, advertising, or promotional
+  purposes without specific prior written permission.
+
+  We suggest,  but do not require, that  you use one or  more of the
+  following phrases to refer  to this software in your documentation
+  or advertising  materials: `FreeType Project',  `FreeType Engine',
+  `FreeType library', or `FreeType Distribution'.
+
+  As  you have  not signed  this license,  you are  not  required to
+  accept  it.   However,  as  the FreeType  Project  is  copyrighted
+  material, only  this license, or  another one contracted  with the
+  authors, grants you  the right to use, distribute,  and modify it.
+  Therefore,  by  using,  distributing,  or modifying  the  FreeType
+  Project, you indicate that you understand and accept all the terms
+  of this license.
+
+4. Contacts
+-----------
+
+  There are two mailing lists related to FreeType:
+
+    o [email protected]
+
+      Discusses general use and applications of FreeType, as well as
+      future and  wanted additions to the  library and distribution.
+      If  you are looking  for support,  start in  this list  if you
+      haven't found anything to help you in the documentation.
+
+    o [email protected]
+
+      Discusses bugs,  as well  as engine internals,  design issues,
+      specific licenses, porting, etc.
+
+  Our home page can be found at
+
+    http://www.freetype.org
+
+
+--- end of FTL.TXT ---
diff --git a/Examples/music_loop/LICENSE.ngn.txt b/Examples/music_loop/LICENSE.ngn.txt
@@ -0,0 +1,55 @@
+*******************************************************************************
+
+    N'gine Lib for C++
+
+    Proyecto iniciado el 1 de Febrero del 2016
+    (cc) 2016 - 2017 by Cesar Rincon "NightFox"
+    http://www.nightfoxandco.com
+    [email protected]
+
+    Requiere SDL2 (2.0.5 or higher)
+    http://www.libsdl.org/download-2.0.php
+
+    Requiere SFML (2.4.1 or higher)
+    http://www.sfml-dev.org/
+
+    Requiere LodePNG
+    (c) 2005 - 2016 by Lode Vandevenne
+    http://lodev.org/lodepng/
+
+
+    N'gine se distribuye bajo la licencia CREATIVE COMMONS
+    "Attribution-NonCommercial 4.0 International"
+    https://creativecommons.org/licenses/by-nc/4.0/
+
+    You are free to:
+
+        - Share
+        copy and redistribute the material in any medium or format.
+        - Adapt
+        remix, transform, and build upon the material.
+
+        The licensor cannot revoke these freedoms as long as you follow
+        the license terms.
+
+    Under the following terms:
+
+        - Attribution
+        You must give appropriate credit, provide a link to the license,
+        and indicate if changes were made. You may do so in any reasonable
+        manner, but not in any way that suggests the licensor endorses you
+        or your use.
+
+        - NonCommercial
+        You may not use the material for commercial purposes.
+
+        - No additional restrictions
+        You may not apply legal terms or technological measures that
+        legally restrict others from doing anything the license permits.
+
+*******************************************************************************
+
+DESCARGO DE RESPONSABILIDAD. EL SOFTWARE SE CONCEDE CON LICENCIA �TAL CUAL�.
+POR CONSIGUIENTE, USTED ASUME EL RIESGO DE UTILIZARLO.
+NO SE OTORGA NINGUNA GARANT�A NI CONDICI�N EXPL�CITAS.
+
diff --git a/Examples/music_loop/LICENSE.sfml.txt b/Examples/music_loop/LICENSE.sfml.txt
@@ -0,0 +1,37 @@
+SFML
+----
+
+SFML - Copyright (C) 2007-2017 Laurent Gomila - [email protected]
+
+This software is provided 'as-is', without any express or
+implied warranty. In no event will the authors be held
+liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute
+it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented;
+   you must not claim that you wrote the original software.
+   If you use this software in a product, an acknowledgment
+   in the product documentation would be appreciated but
+   is not required.
+
+2. Altered source versions must be plainly marked as such,
+   and must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any
+   source distribution.
+
+
+
+External libraries used by SFML
+-------------------------------
+
+* OpenAL-Soft is under the LGPL license
+* libjpeg is public domain
+* stb_image and stb_image_write are public domain
+* freetype is under the FreeType license or the GPL license
+* libogg is under the BSD license
+* libvorbis is under the BSD license
+* libflac is under the BSD license