Ver código fonte

Fix erratic indentation and file encoding.

legacy
Sam Hocevar 8 anos atrás
pai
commit
b9effc8977
4 arquivos alterados com 30 adições e 29 exclusões
  1. +1
    -1
      doc/samples/physics/bulletcharactercontroller.cpp
  2. +1
    -1
      doc/samples/physics/easycharactercontroller.cpp
  3. +9
    -8
      src/easymesh/easymeshbuild.cpp
  4. +19
    -19
      src/image/resource.cpp

+ 1
- 1
doc/samples/physics/bulletcharactercontroller.cpp Ver arquivo

@@ -2,7 +2,7 @@
// Lol Engine // Lol Engine
// //
// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net> // Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
// (c) 2009-2013 Cédric Lecacheur <jordx@free.fr>
// (c) 2009-2013 Cédric Lecacheur <jordx@free.fr>
// (c) 2009-2013 Benjamin "Touky" Huet <huet.benjamin@gmail.com> // (c) 2009-2013 Benjamin "Touky" Huet <huet.benjamin@gmail.com>
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the Do What The Fuck You Want To // modify it under the terms of the Do What The Fuck You Want To


+ 1
- 1
doc/samples/physics/easycharactercontroller.cpp Ver arquivo

@@ -2,7 +2,7 @@
// Lol Engine // Lol Engine
// //
// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net> // Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
// (c) 2009-2013 Cédric Lecacheur <jordx@free.fr>
// (c) 2009-2013 Cédric Lecacheur <jordx@free.fr>
// (c) 2009-2013 Benjamin "Touky" Huet <huet.benjamin@gmail.com> // (c) 2009-2013 Benjamin "Touky" Huet <huet.benjamin@gmail.com>
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the Do What The Fuck You Want To // modify it under the terms of the Do What The Fuck You Want To


+ 9
- 8
src/easymesh/easymeshbuild.cpp Ver arquivo

@@ -1,14 +1,15 @@
// //
// EasyMesh-Build: The code belonging to Vertex build operations
// Lol Engine
// //
// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
// (c) 2009-2013 Cédric Lecacheur <jordx@free.fr>
// (c) 2009-2013 Benjamin "Touky" Huet <huet.benjamin@gmail.com>
// This program is free software; you can redistribute it and/or
// modify it under the terms of the Do What The Fuck You Want To
// Public License, Version 2, as published by Sam Hocevar. See
// http://www.wtfpl.net/ for more details.
// Copyright © 2009—2013 Benjamin “Touky” Huet <huet.benjamin@gmail.com>
// © 2010—2017 Sam Hocevar <sam@hocevar.net>
// © 2009—2013 Cédric Lecacheur <jordx@free.fr>
// //
// Lol Engine is free software. It comes without any warranty, to
// the extent permitted by applicable law. You can redistribute it
// and/or modify it under the terms of the Do What the Fuck You Want
// to Public License, Version 2, as published by the WTFPL Task Force.
// See http://www.wtfpl.net/ for more details.


#include <lol/engine-internal.h> #include <lol/engine-internal.h>




+ 19
- 19
src/image/resource.cpp Ver arquivo

@@ -21,39 +21,39 @@ namespace lol
{ {


/* HACK: We cannot make this an ImageLoader member function, because the /* HACK: We cannot make this an ImageLoader member function, because the
* REGISTER_IMAGE_CODEC macro forward-declares free functions from
* the "lol" namespace. An apparent bug in Visual Studio's compiler
* makes it think these functions are actually in the top-level
* namespace when the forward declaration is in a class member function.
* To avoid the problem, we make the forward declaration in a free
* function.
* The bug was reported to Microsoft and fixed by them, but the fix
* is not yet available.
* https://connect.microsoft.com/VisualStudio/feedback/details/730878/ */
* REGISTER_IMAGE_CODEC macro forward-declares free functions from
* the "lol" namespace. An apparent bug in Visual Studio's compiler
* makes it think these functions are actually in the top-level
* namespace when the forward declaration is in a class member function.
* To avoid the problem, we make the forward declaration in a free
* function.
* The bug was reported to Microsoft and fixed by them, but the fix
* is not yet available.
* https://connect.microsoft.com/VisualStudio/feedback/details/730878/ */
static bool RegisterAllCodecs(array<ResourceCodec *> &codeclist) static bool RegisterAllCodecs(array<ResourceCodec *> &codeclist)
{ {
#if defined __ANDROID__ #if defined __ANDROID__
REGISTER_IMAGE_CODEC(AndroidImageCodec) REGISTER_IMAGE_CODEC(AndroidImageCodec)
#endif #endif
#if defined LOL_USE_GDIPLUS #if defined LOL_USE_GDIPLUS
REGISTER_IMAGE_CODEC(GdiPlusImageCodec)
REGISTER_IMAGE_CODEC(GdiPlusImageCodec)
#endif #endif
#if defined __APPLE__ && defined __MACH__ && defined __arm__ #if defined __APPLE__ && defined __MACH__ && defined __arm__
REGISTER_IMAGE_CODEC(IosImageCodec)
REGISTER_IMAGE_CODEC(IosImageCodec)
#endif #endif
#if defined LOL_USE_SDL_IMAGE #if defined LOL_USE_SDL_IMAGE
REGISTER_IMAGE_CODEC(SdlImageCodec)
REGISTER_IMAGE_CODEC(SdlImageCodec)
#endif #endif
#if defined LOL_USE_IMLIB2 #if defined LOL_USE_IMLIB2
REGISTER_IMAGE_CODEC(Imlib2ImageCodec)
REGISTER_IMAGE_CODEC(Imlib2ImageCodec)
#endif #endif
REGISTER_IMAGE_CODEC(ZedImageCodec)
REGISTER_IMAGE_CODEC(ZedPaletteImageCodec)
REGISTER_IMAGE_CODEC(OricImageCodec)
REGISTER_IMAGE_CODEC(ZedImageCodec)
REGISTER_IMAGE_CODEC(ZedPaletteImageCodec)
REGISTER_IMAGE_CODEC(OricImageCodec)


REGISTER_IMAGE_CODEC(DummyImageCodec)
REGISTER_IMAGE_CODEC(DummyImageCodec)


return true;
return true;
} }


/* /*
@@ -108,7 +108,7 @@ bool ResourceLoader::Save(char const *path, ResourceCodecData* data)
last_codec = codec; last_codec = codec;
if (codec->Save(path, data)) if (codec->Save(path, data))
{ {
msg::info("image::save: codec %s succesfully saved %s.\n",
msg::debug("image::save: codec %s succesfully saved %s.\n",
codec->GetName(), path); codec->GetName(), path);
return true; return true;
} }


Carregando…
Cancelar
Salvar