[Commits] [wesnoth/wesnoth] 633d7d: Cleaned up handling of basic alpha setting

GitHub noreply at github.com
Thu Sep 15 05:00:45 UTC 2016


  Branch: refs/heads/surface_cleanup
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 633d7d1c039436959ce04544c8fa263ce5f57ae4
      https://github.com/wesnoth/wesnoth/commit/633d7d1c039436959ce04544c8fa263ce5f57ae4
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/attack_prediction_display.cpp
    M src/display.cpp
    M src/editor/action/mouse/mouse_action.cpp
    M src/editor/action/mouse/mouse_action_item.cpp
    M src/editor/action/mouse/mouse_action_map_label.cpp
    M src/editor/action/mouse/mouse_action_select.cpp
    M src/editor/action/mouse/mouse_action_unit.cpp
    M src/editor/action/mouse/mouse_action_village.cpp
    M src/editor/palette/tristate_button.cpp
    M src/floating_label.cpp
    M src/font.cpp
    M src/game_display.cpp
    M src/image_modifications.cpp
    R src/sdl/alpha.cpp
    R src/sdl/alpha.hpp
    M src/sdl/rect.cpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp
    M src/widgets/textbox.cpp

  Log Message:
  -----------
  Cleaned up handling of basic alpha setting

This does a few things:
* Refactored adjust_surface_alpha to use SDL_SetSurfaceAlphaMod
* Made all uses of the legacy SDL_SetAlpha use adjust_surface_alpha
* Made adjust_surface_alpha now take a non-const reference and perform the operation on the surface directly.


  Commit: da818c186750014a2fc32ed7b6b4a563696f365a
      https://github.com/wesnoth/wesnoth/commit/da818c186750014a2fc32ed7b6b4a563696f365a
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M src/sdl/utils.cpp

  Log Message:
  -----------
  Removed old Pandora compatibility code


  Commit: ed8c8fbd396eb0a9643a6993ea9d550033b35adb
      https://github.com/wesnoth/wesnoth/commit/ed8c8fbd396eb0a9643a6993ea9d550033b35adb
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M src/floating_label.cpp
    M src/image.cpp
    M src/image_modifications.cpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp

  Log Message:
  -----------
  Refactored out create_optimized_surface

Instead, we simply call adjust_surface_alpha directly. This removes the creation of another temporary surface.
This also removes cases when it's called after creating a surface with create_neutral_surface, since that
function should produce the same result.


  Commit: 646ee1dc68a6b9f439f424160db1832143441a8f
      https://github.com/wesnoth/wesnoth/commit/646ee1dc68a6b9f439f424160db1832143441a8f
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M src/sdl/utils.hpp

  Log Message:
  -----------
  Refactored use of util::scoped_resource out of surface struct (now class)

util::scoped_resource is likely going to be removed soon and replaced with std::unique_ptr. However,
due to the custom refcounting done on the SDL_Surfaces, here, we cannot use unique_ptr or shared_ptr.
Therefor, we simply add the functionality manually.


  Commit: 75eda82c9932fda795e0c958160e944edc6b2c4c
      https://github.com/wesnoth/wesnoth/commit/75eda82c9932fda795e0c958160e944edc6b2c4c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M src/gui/core/canvas.cpp
    M src/sdl/utils.hpp

  Log Message:
  -----------
  Allow any surface to create its own SDL software (surface) renderer

The surface object is in charge of the life of the renderer.


  Commit: bdf57214e834ce6f10c1525b524694d02ac5189e
      https://github.com/wesnoth/wesnoth/commit/bdf57214e834ce6f10c1525b524694d02ac5189e
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M projectfiles/CodeBlocks/wesnoth.cbp
    M src/CMakeLists.txt
    M src/SConscript
    M src/gui/core/canvas.cpp
    A src/sdl/renderer.cpp
    A src/sdl/renderer.hpp

  Log Message:
  -----------
  Split drawing primitives helpers out of the GUI2 canvas and into their own file

This doesn't move the draw() functions in each tshape class, just three static helpers.


Compare: https://github.com/wesnoth/wesnoth/compare/86d187e106b2...bdf57214e834


More information about the Commits mailing list