[xoreos-git] [xoreos/xoreos] dae973: GRAPHICS: Add Renderable::fade()

Fri Feb 7 16:10:12 CET 2014

  Branch: refs/heads/ogrewip
  Home:   https://github.com/xoreos/xoreos
  Commit: dae9739263c61a1c06eda0b91e5f5cb50f0555f7
      https://github.com/xoreos/xoreos/commit/dae9739263c61a1c06eda0b91e5f5cb50f0555f7
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/graphics/renderable.cpp
    M src/graphics/renderable.h
    M src/graphics/renderer.cpp

  Log Message:
  -----------
  GRAPHICS: Add Renderable::fade()

This lets a Renderable be fade in or out.

  Commit: d4bd051e7df20b28ae3919981b95d72dfbac66fe
      https://github.com/xoreos/xoreos/commit/d4bd051e7df20b28ae3919981b95d72dfbac66fe
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/graphics/renderable.cpp
    M src/graphics/renderable.h

  Log Message:
  -----------
  GRAPHICS: Add Renderable::getSize()

  Commit: fb023bd6547564870c24f68a9327647a481c06b7
      https://github.com/xoreos/xoreos/commit/fb023bd6547564870c24f68a9327647a481c06b7
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/graphics/aurora/model.cpp
    M src/graphics/aurora/model.h
    M src/graphics/aurora/model_kotor.cpp
    M src/graphics/aurora/model_kotor.h
    M src/graphics/aurora/model_nwn.cpp
    M src/graphics/aurora/model_nwn.h
    M src/graphics/aurora/model_nwn2.cpp
    M src/graphics/aurora/model_nwn2.h
    M src/graphics/aurora/model_witcher.cpp
    M src/graphics/aurora/model_witcher.h

  Log Message:
  -----------
  GRAPHICS: Move _fileName and _name into Model

  Commit: 554418d63391b392e50b9367f12456ea1ee1931b
      https://github.com/xoreos/xoreos/commit/554418d63391b392e50b9367f12456ea1ee1931b
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M m4/boost.m4

  Log Message:
  -----------
  BUILD: Extend boost.m4 to check for Boost.Atomic

  Commit: 8a7c6b6b5333031a250c0e5a652903ce49ab042b
      https://github.com/xoreos/xoreos/commit/8a7c6b6b5333031a250c0e5a652903ce49ab042b
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M BUILDDEP
    M Makefile.common
    M configure.ac

  Log Message:
  -----------
  BUILD: Add dependency on Boost.Atomic

  Commit: 3acce33c1fbe0480add1fed1fec7bfadc8cf3010
      https://github.com/xoreos/xoreos/commit/3acce33c1fbe0480add1fed1fec7bfadc8cf3010
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/graphics/graphics.cpp
    M src/graphics/graphics.h

  Log Message:
  -----------
  GRAPHICS: Add a new frame locking mechanism

The problem with our current LOCK_FRAME() method that locks Ogre's
SceneMutex is that it blocks in the render loop, therefore producing
a deadlock when locking the frame and then forcing a function into
the main thread (since those functions are handled in the same thread
that's then waiting on the SceneMutex).

To prevent that, we now implement a simple frame lock using atomics
that doesn't block the main render loop. Instead, if the render
method can't aquire the frame lock, it will simply jump over the
rendering and continue with processing the event queue.

  Commit: 98fe5f37e4ce70f0aca4dd3a69321d46f801227e
      https://github.com/xoreos/xoreos/commit/98fe5f37e4ce70f0aca4dd3a69321d46f801227e
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/graphics/aurora/model.cpp
    M src/graphics/graphics.h
    M src/graphics/renderable.cpp
    M src/graphics/renderer.cpp
    M src/graphics/util.h
    M src/video/aurora/videoplayer.cpp

  Log Message:
  -----------
  GRAPHICS: Use the new frame locking mechanism

  Commit: 0eba471b3d3600a6f6e724dadfbc656a5796cfbd
      https://github.com/xoreos/xoreos/commit/0eba471b3d3600a6f6e724dadfbc656a5796cfbd
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/events/events.cpp

  Log Message:
  -----------
  EVENTS: Register one custom event with SDL (ITC)

  Commit: 45f41d93f4f63510678c93ca7c539bd3c65f043b
      https://github.com/xoreos/xoreos/commit/45f41d93f4f63510678c93ca7c539bd3c65f043b
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/graphics/materialman.cpp

  Log Message:
  -----------
  GRAPHICS: Add support for the "decal" texture property

  Commit: c2a9c77a12f1be2870615bbdbbb8acb132cf2910
      https://github.com/xoreos/xoreos/commit/c2a9c77a12f1be2870615bbdbbb8acb132cf2910
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/graphics/aurora/quad.cpp
    M src/graphics/materialman.cpp

  Log Message:
  -----------
  GRAPHICS: Always blend entities according to the material's alpha

The material's transparency state now only disables depth writing.

  Commit: 8eabdbd7e474e1878abf9420908344cd452dedb9
      https://github.com/xoreos/xoreos/commit/8eabdbd7e474e1878abf9420908344cd452dedb9
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/common/uuid.cpp

  Log Message:
  -----------
  COMMON: Make generateIDNumber() thread-safe

  Commit: 3965850d51e798b660777abc42e5d765ab4f6a6b
      https://github.com/xoreos/xoreos/commit/3965850d51e798b660777abc42e5d765ab4f6a6b
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/common/uuid.cpp

  Log Message:
  -----------
  COMMON: Split generateIDNumber() and generateIDNumberString()

  Commit: bde54f4ffeb69fe77a5b42d5d7a3f21f05ba3b4b
      https://github.com/xoreos/xoreos/commit/bde54f4ffeb69fe77a5b42d5d7a3f21f05ba3b4b
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/graphics/aurora/cube.cpp
    M src/graphics/aurora/model.cpp
    M src/graphics/aurora/model_kotor.cpp
    M src/graphics/aurora/model_nwn.cpp
    M src/graphics/aurora/model_nwn2.cpp
    M src/graphics/aurora/model_witcher.cpp
    M src/graphics/aurora/quad.cpp
    M src/graphics/aurora/text.cpp
    M src/graphics/aurora/ttffont.cpp
    M src/graphics/materialman.cpp

  Log Message:
  -----------
  GRAPHICS: Use generateIDNumberString() instead of generateIDRandomString()

generateIDRandomString() is slower...

  Commit: 54b41de330d121cab0810faf3c70f0ebc19c0dce
      https://github.com/xoreos/xoreos/commit/54b41de330d121cab0810faf3c70f0ebc19c0dce
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/graphics/aurora/model.cpp
    M src/graphics/aurora/model.h

  Log Message:
  -----------
  GRAPHICS: Add Model::hasNode()

  Commit: cc1483d4b6dca61d06978ed353d703e520a7015a
      https://github.com/xoreos/xoreos/commit/cc1483d4b6dca61d06978ed353d703e520a7015a
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/graphics/aurora/model.cpp
    M src/graphics/aurora/model.h

  Log Message:
  -----------
  GRAPHICS: Add Model::getNode()

  Commit: 9793687d8175eed864322512781a73730ee5fa53
      https://github.com/xoreos/xoreos/commit/9793687d8175eed864322512781a73730ee5fa53
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M src/graphics/renderable.cpp
    M src/graphics/renderable.h

  Log Message:
  -----------
  GRAPHICS: Add getNodeSize()

  Commit: 28b85474e033cd5e0e773e9f81ddce6a8b7d69fe
      https://github.com/xoreos/xoreos/commit/28b85474e033cd5e0e773e9f81ddce6a8b7d69fe
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/engines/aurora/gui.cpp
    M src/engines/aurora/gui.h
    M src/engines/aurora/widget.cpp
    M src/engines/aurora/widget.h
    M src/engines/nwn/Makefile.am
    A src/engines/nwn/gui/chargen/chargen.cpp
    A src/engines/nwn/gui/chargen/chargen.h
    A src/engines/nwn/gui/dialogs/okcancel.cpp
    A src/engines/nwn/gui/dialogs/okcancel.h
    A src/engines/nwn/gui/dialogs/yesnocancel.cpp
    A src/engines/nwn/gui/dialogs/yesnocancel.h
    A src/engines/nwn/gui/gui.cpp
    A src/engines/nwn/gui/gui.h
    A src/engines/nwn/gui/ingame/charinfo.cpp
    A src/engines/nwn/gui/ingame/charinfo.h
    A src/engines/nwn/gui/ingame/compass.cpp
    A src/engines/nwn/gui/ingame/compass.h
    A src/engines/nwn/gui/ingame/dialog.cpp
    A src/engines/nwn/gui/ingame/dialog.h
    A src/engines/nwn/gui/ingame/ingame.cpp
    A src/engines/nwn/gui/ingame/ingame.h
    A src/engines/nwn/gui/ingame/main.cpp
    A src/engines/nwn/gui/ingame/main.h
    A src/engines/nwn/gui/ingame/partyleader.cpp
    A src/engines/nwn/gui/ingame/partyleader.h
    A src/engines/nwn/gui/ingame/quickbar.cpp
    A src/engines/nwn/gui/ingame/quickbar.h
    A src/engines/nwn/gui/ingame/quickchat.cpp
    A src/engines/nwn/gui/ingame/quickchat.h
    A src/engines/nwn/gui/main/charpremade.cpp
    A src/engines/nwn/gui/main/charpremade.h
    A src/engines/nwn/gui/main/chartype.cpp
    A src/engines/nwn/gui/main/chartype.h
    A src/engines/nwn/gui/main/main.cpp
    A src/engines/nwn/gui/main/main.h
    A src/engines/nwn/gui/main/moviesbase.cpp
    A src/engines/nwn/gui/main/moviesbase.h
    A src/engines/nwn/gui/main/moviescamp.cpp
    A src/engines/nwn/gui/main/moviescamp.h
    A src/engines/nwn/gui/main/new.cpp
    A src/engines/nwn/gui/main/new.h
    A src/engines/nwn/gui/main/newcamp.cpp
    A src/engines/nwn/gui/main/newcamp.h
    A src/engines/nwn/gui/main/newgamefog.cpp
    A src/engines/nwn/gui/main/newgamefog.h
    A src/engines/nwn/gui/main/newmodule.cpp
    A src/engines/nwn/gui/main/newmodule.h
    A src/engines/nwn/gui/main/newxp1.cpp
    A src/engines/nwn/gui/main/newxp1.h
    A src/engines/nwn/gui/main/newxp2.cpp
    A src/engines/nwn/gui/main/newxp2.h
    A src/engines/nwn/gui/main/options.cpp
    A src/engines/nwn/gui/main/options.h
    A src/engines/nwn/gui/options/controls.cpp
    A src/engines/nwn/gui/options/controls.h
    A src/engines/nwn/gui/options/feedback.cpp
    A src/engines/nwn/gui/options/feedback.h
    A src/engines/nwn/gui/options/game.cpp
    A src/engines/nwn/gui/options/game.h
    A src/engines/nwn/gui/options/gorepass.cpp
    A src/engines/nwn/gui/options/gorepass.h
    A src/engines/nwn/gui/options/resolution.cpp
    A src/engines/nwn/gui/options/resolution.h
    A src/engines/nwn/gui/options/sound.cpp
    A src/engines/nwn/gui/options/sound.h
    A src/engines/nwn/gui/options/soundadv.cpp
    A src/engines/nwn/gui/options/soundadv.h
    A src/engines/nwn/gui/options/video.cpp
    A src/engines/nwn/gui/options/video.h
    A src/engines/nwn/gui/options/videoadv.cpp
    A src/engines/nwn/gui/options/videoadv.h
    A src/engines/nwn/gui/widgets/button.cpp
    A src/engines/nwn/gui/widgets/button.h
    A src/engines/nwn/gui/widgets/checkbox.cpp
    A src/engines/nwn/gui/widgets/checkbox.h
    A src/engines/nwn/gui/widgets/close.cpp
    A src/engines/nwn/gui/widgets/close.h
    A src/engines/nwn/gui/widgets/editbox.cpp
    A src/engines/nwn/gui/widgets/editbox.h
    A src/engines/nwn/gui/widgets/frame.cpp
    A src/engines/nwn/gui/widgets/frame.h
    A src/engines/nwn/gui/widgets/label.cpp
    A src/engines/nwn/gui/widgets/label.h
    A src/engines/nwn/gui/widgets/listbox.cpp
    A src/engines/nwn/gui/widgets/listbox.h
    A src/engines/nwn/gui/widgets/modelwidget.cpp
    A src/engines/nwn/gui/widgets/modelwidget.h
    A src/engines/nwn/gui/widgets/nwnwidget.cpp
    A src/engines/nwn/gui/widgets/nwnwidget.h
    A src/engines/nwn/gui/widgets/panel.cpp
    A src/engines/nwn/gui/widgets/panel.h
    A src/engines/nwn/gui/widgets/portrait.cpp
    A src/engines/nwn/gui/widgets/portrait.h
    A src/engines/nwn/gui/widgets/quadwidget.cpp
    A src/engines/nwn/gui/widgets/quadwidget.h
    A src/engines/nwn/gui/widgets/scrollbar.cpp
    A src/engines/nwn/gui/widgets/scrollbar.h
    A src/engines/nwn/gui/widgets/slider.cpp
    A src/engines/nwn/gui/widgets/slider.h
    A src/engines/nwn/gui/widgets/textwidget.cpp
    A src/engines/nwn/gui/widgets/textwidget.h
    A src/engines/nwn/gui/widgets/tooltip.cpp
    A src/engines/nwn/gui/widgets/tooltip.h

  Log Message:
  -----------
  NWN: Add back the GUI

  Commit: a78715ff3fc3f74207a02342e22fd971e04f8e8f
      https://github.com/xoreos/xoreos/commit/a78715ff3fc3f74207a02342e22fd971e04f8e8f
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/engines/nwn/nwn.cpp

  Log Message:
  -----------
  NWN: Add back the main menu

  Commit: 61273a98097f77a3ca0da07768d571528595b292
      https://github.com/xoreos/xoreos/commit/61273a98097f77a3ca0da07768d571528595b292
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/graphics/aurora/model_nwn.cpp

  Log Message:
  -----------
  GRAPHICS: Fix orientation in NWN ASCII model nodes

ASCII models use axis + angle instead of quaternions.

  Commit: 36ab8ab13815c4e074ad8f862504c58685167ea0
      https://github.com/xoreos/xoreos/commit/36ab8ab13815c4e074ad8f862504c58685167ea0
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/engines/nwn/gui/widgets/button.cpp

  Log Message:
  -----------
  NWN: Use the default state for "up" in buttons

This seems to fix the a few buttons that looked
like they were stuck.

  Commit: 1601579ed95f688590918759c056fca879d2b828
      https://github.com/xoreos/xoreos/commit/1601579ed95f688590918759c056fca879d2b828
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/engines/nwn/Makefile.am
    M src/engines/nwn/gui/dialogs/okcancel.cpp
    M src/engines/nwn/gui/dialogs/okcancel.h
    M src/engines/nwn/gui/dialogs/yesnocancel.cpp
    M src/engines/nwn/gui/dialogs/yesnocancel.h
    M src/engines/nwn/gui/ingame/main.cpp
    M src/engines/nwn/module.cpp
    M src/engines/nwn/module.h

  Log Message:
  -----------
  NWN: Add back the ingame main menu

  Commit: ec7a0fb8422c6fea52be44ff8bbf86e6289a15ea
      https://github.com/xoreos/xoreos/commit/ec7a0fb8422c6fea52be44ff8bbf86e6289a15ea
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/engines/nwn/gui/main/main.cpp
    M src/engines/nwn/nwn.cpp
    M src/engines/nwn/nwn.h

  Log Message:
  -----------
  NWN: Add back the legal billboard

  Commit: e89dc2801b87c8031843c519bef13615a8b0a2be
      https://github.com/xoreos/xoreos/commit/e89dc2801b87c8031843c519bef13615a8b0a2be
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/engines/nwn/gui/main/charpremade.cpp
    M src/engines/nwn/module.cpp
    M src/engines/nwn/module.h

  Log Message:
  -----------
  NWN: Add back setting a PC for a module

  Commit: da25a1e43ba4ce19cefd9bdd36e209dea8b83124
      https://github.com/xoreos/xoreos/commit/da25a1e43ba4ce19cefd9bdd36e209dea8b83124
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/graphics/images/decoder.cpp
    M src/graphics/images/decoder.h
    M src/graphics/images/s3tc.cpp
    M src/graphics/images/s3tc.h

  Log Message:
  -----------
  GRAPHICS: Add ImageDecoder::isTransparent()

  Commit: 10411543ae7a29efbd361246b7fed54cc45aa25e
      https://github.com/xoreos/xoreos/commit/10411543ae7a29efbd361246b7fed54cc45aa25e
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/graphics/cameraman.cpp
    M src/graphics/cameraman.h
    M src/graphics/renderer.cpp
    M src/graphics/renderer.h

  Log Message:
  -----------
  GRAPHICS: Move the scene viewport into the CameraManager

  Commit: 2efb2e9f05ccd5b7b7f8d9849c18620e8f95d518
      https://github.com/xoreos/xoreos/commit/2efb2e9f05ccd5b7b7f8d9849c18620e8f95d518
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/graphics/guiman.cpp
    M src/graphics/guiman.h
    M src/graphics/renderer.cpp
    M src/graphics/renderer.h

  Log Message:
  -----------
  GRAPHICS: Change the GUI manager to render directly into the window

Change the GUI manager to render directly into the window instead of
rendering into a Overlay texture.

  Commit: 5835949a116cb52935eb0155e293f270254208c6
      https://github.com/xoreos/xoreos/commit/5835949a116cb52935eb0155e293f270254208c6
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/engines/aurora/gui.cpp
    M src/engines/nwn/gui/main/newmodule.cpp
    M src/engines/nwn/gui/widgets/listbox.cpp
    M src/engines/nwn/nwn.cpp
    M src/graphics/aurora/fps.cpp
    M src/graphics/guiman.cpp
    M src/graphics/guiman.h

  Log Message:
  -----------
  GRAPHICS: Remove the now useless GUIMan::update() method

  Commit: f5417b60a562d17fa1f41c5b0b805a73f34d9477
      https://github.com/xoreos/xoreos/commit/f5417b60a562d17fa1f41c5b0b805a73f34d9477
  Author: Sven Hesse <drmccoy at drmccoy.de>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/engines/kotor/kotor.cpp
    M src/engines/kotor2/kotor2.cpp

  Log Message:
  -----------
  KOTOR TESTCASE

Compare: https://github.com/xoreos/xoreos/compare/9df477e07d53...f5417b60a562