[epiar-commits] [knowknowledge/Epiar] 06f903: Work on Image::Resize()

Wed Dec 30 22:07:08 PST 2009

Branch: refs/heads/master
Home:   http://github.com/knowknowledge/Epiar

Commit: 06f9035c63070489a8cd6aad6d93ec99eceb73b7
    http://github.com/knowknowledge/Epiar/commit/06f9035c63070489a8cd6aad6d93ec99eceb73b7
Author: Christopher Thielen <cthielen at new-host-4.home>
Date:   2009-12-26 (Sat, 26 Dec 2009)

Changed paths:
  M ChangeLog
  M Resources/Definitions/engines-default.xml
  M Resources/Definitions/options.xml
  M Resources/Scripts/tag.lua
  M Source/Engine/hud.cpp
  M Source/Graphics/image.cpp
  M Source/Sprites/ship.cpp
  M Source/Sprites/sprite.cpp
  M Source/UI/ui_window.cpp
  M Source/Utilities/camera.cpp
  M configure.in

Log Message:
-----------
Work on Image::Resize()

Commit: 25968aeb8fca9c9d4b986632209eaca5adc81234
    http://github.com/knowknowledge/Epiar/commit/25968aeb8fca9c9d4b986632209eaca5adc81234
Author: Christopher Thielen <cthielen at new-host-4.home>
Date:   2009-12-26 (Sat, 26 Dec 2009)

Changed paths:
  M .gitignore
  M BUILDING
  M ChangeLog
  A Doxygen/MainPage.h
  M Makefile.am
  M Resources/Definitions/engines-default.xml
  M Resources/Definitions/models-default.xml
  M Resources/Definitions/weapons-default.xml
  A Resources/Fonts/FreeSans.ttf
  A Resources/Graphics/laser_blue.png
  A Resources/Graphics/laser_green.png
  A Resources/Graphics/laser_grey.png
  A Resources/Graphics/missile.png
  A Resources/Graphics/torpedo.png
  M Resources/Scripts/basics.lua
  M Resources/Scripts/tag.lua
  M Resources/Scripts/universe.lua
  M Source/AI/ai.cpp
  M Source/AI/ai.h
  M Source/AI/ai_lua.cpp
  M Source/AI/ai_lua.h
  A Source/Doxyfile
  M Source/Engine/Makefile.am
  M Source/Engine/alliances.cpp
  M Source/Engine/alliances.h
  M Source/Engine/console.cpp
  M Source/Engine/console.h
  M Source/Engine/engines.cpp
  M Source/Engine/engines.h
  M Source/Engine/hud.cpp
  M Source/Engine/hud.h
  M Source/Engine/models.cpp
  M Source/Engine/models.h
  M Source/Engine/quadrant.cpp
  M Source/Engine/simulation.cpp
  M Source/Engine/simulation.h
  M Source/Engine/starfield.cpp
  M Source/Engine/starfield.h
  M Source/Engine/weapon.cpp
  M Source/Engine/weapon.h
  M Source/Engine/weapons.cpp
  M Source/Engine/weapons.h
  M Source/Graphics/afont/afont.h
  M Source/Graphics/afont/afont_base.cpp
  M Source/Graphics/afont/afont_gl.cpp
  M Source/Graphics/afont/afont_gl.h
  M Source/Graphics/animation.cpp
  M Source/Graphics/animation.h
  M Source/Graphics/font.cpp
  M Source/Graphics/font.h
  M Source/Graphics/image.cpp
  M Source/Graphics/image.h
  M Source/Graphics/video.cpp
  M Source/Graphics/video.h
  M Source/IDE/MSVC9/Epiar.vcproj
  M Source/Input/input.cpp
  M Source/Input/input.h
  M Source/Menu/menu.cpp
  M Source/Server/client.cpp
  M Source/Server/epiard.cpp
  A Source/Sprites/effects.cpp
  A Source/Sprites/effects.h
  M Source/Sprites/planets.cpp
  M Source/Sprites/planets.h
  M Source/Sprites/player.cpp
  M Source/Sprites/player.h
  M Source/Sprites/projectile.cpp
  M Source/Sprites/projectile.h
  M Source/Sprites/ship.cpp
  M Source/Sprites/ship.h
  M Source/Sprites/sprite.cpp
  M Source/Sprites/sprite.h
  M Source/Sprites/spritemanager.cpp
  M Source/Sprites/spritemanager.h
  M Source/Tests/graphics.cpp
  M Source/Tests/graphics.h
  M Source/Tests/lua_test.cpp
  M Source/UI/ui.cpp
  M Source/UI/ui.h
  M Source/UI/ui_button.cpp
  M Source/UI/ui_button.h
  M Source/UI/ui_label.cpp
  M Source/UI/ui_label.h
  M Source/UI/ui_lua.cpp
  M Source/UI/ui_lua.h
  M Source/UI/ui_picture.cpp
  M Source/UI/ui_picture.h
  M Source/UI/ui_textbox.cpp
  M Source/UI/ui_textbox.h
  M Source/UI/ui_widget.cpp
  M Source/UI/ui_widget.h
  M Source/UI/ui_window.cpp
  M Source/UI/ui_window.h
  R Source/Utilities/archive.cpp
  R Source/Utilities/archive.h
  M Source/Utilities/camera.cpp
  M Source/Utilities/camera.h
  M Source/Utilities/cmath.cpp
  M Source/Utilities/cmath.h
  M Source/Utilities/coordinate.cpp
  M Source/Utilities/coordinate.h
  M Source/Utilities/debug.cpp
  M Source/Utilities/debug.h
  M Source/Utilities/file.cpp
  M Source/Utilities/file.h
  A Source/Utilities/filesystem.cpp
  A Source/Utilities/filesystem.h
  M Source/Utilities/hashtbl.cpp
  M Source/Utilities/hashtbl.h
  M Source/Utilities/log.cpp
  M Source/Utilities/log.h
  M Source/Utilities/lua.cpp
  M Source/Utilities/lua.h
  R Source/Utilities/parser.cxx
  M Source/Utilities/parser.h
  M Source/Utilities/quadtree.cpp
  M Source/Utilities/quadtree.h
  A Source/Utilities/resource.cpp
  A Source/Utilities/resource.h
  M Source/Utilities/string_convert.h
  M Source/Utilities/timer.cpp
  M Source/Utilities/timer.h
  M Source/Utilities/trig.cpp
  M Source/Utilities/trig.h
  M Source/Utilities/vector.cpp
  M Source/Utilities/vector.h
  M Source/Utilities/vfl.h
  M Source/Utilities/xml.cpp
  M Source/Utilities/xml.h
  M Source/common.h
  M Source/defines.h
  M Source/includes.h
  M Source/main.cpp
  M Source/version.h
  M aclocal.m4
  M configure.in
  R data.tgz

Log Message:
-----------
Merge branch 'master' of git://github.com/knowknowledge/Epiar into UI

Conflicts:
	ChangeLog
	Resources/Scripts/tag.lua
	Source/Engine/hud.cpp
	Source/Sprites/ship.cpp

Commit: 2ce5e1ef55d86ca642c38fde506bfbe4a4e392b1
    http://github.com/knowknowledge/Epiar/commit/2ce5e1ef55d86ca642c38fde506bfbe4a4e392b1
Author: Christopher Thielen <cthielen at christopher-thielens-macbook-pro.local>
Date:   2009-12-26 (Sat, 26 Dec 2009)

Changed paths:
  M Source/Sprites/ship.cpp

Log Message:
-----------
Fixed Image::Resize and merged the FTGL branch in the UI branch.

Commit: 34164fe9c60068d15ec5a3a44bb396ddf8d0be34
    http://github.com/knowknowledge/Epiar/commit/34164fe9c60068d15ec5a3a44bb396ddf8d0be34
Author: Christopher Thielen <cthielen at christopher-thielens-macbook-pro.local>
Date:   2009-12-26 (Sat, 26 Dec 2009)

Changed paths:
  M Source/Graphics/font.cpp
  M Source/Input/input.cpp
  M Source/UI/ui.cpp
  M Source/UI/ui_button.cpp
  M Source/UI/ui_widget.cpp
  M Source/UI/ui_window.cpp
  M Source/UI/ui_window.h

Log Message:
-----------
More UI work. Fixed a few bugs and applied DRY principle to Font code.

Commit: c6002fee9abe32261945630b5f91236d7f6c9a52
    http://github.com/knowknowledge/Epiar/commit/c6002fee9abe32261945630b5f91236d7f6c9a52
Author: Christopher Thielen <cthielen at christopher-thielens-macbook-pro.local>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  M .gitignore
  M Source/UI/ui.cpp
  M Source/UI/ui.h
  M Source/UI/ui_button.cpp
  M Source/UI/ui_button.h
  M Source/UI/ui_picture.h
  M Source/UI/ui_textbox.cpp
  M Source/UI/ui_textbox.h
  M Source/UI/ui_widget.cpp
  M Source/UI/ui_widget.h
  M Source/UI/ui_window.cpp
  M Source/UI/ui_window.h
  M Source/Utilities/log.cpp
  M Source/Utilities/log.h
  M Source/main.cpp

Log Message:
-----------
More UI work. Also turned off XML logging by default. It is turned on by passing --enable-logging. It will display as text only (no file log) is the DEBUG preprocessor flag is set.

Commit: 5ce73c49c9a43fc1be4786e094e3f409be37b436
    http://github.com/knowknowledge/Epiar/commit/5ce73c49c9a43fc1be4786e094e3f409be37b436
Author: Christopher Thielen <cthielen at christopher-thielens-macbook-pro.local>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  M Resources/Scripts/tag.lua

Log Message:
-----------
Fixed a problem where I left the git merge code in tag.lua.

Commit: 6f62c337480d822c1bd42ab3b9259d091aec2670
    http://github.com/knowknowledge/Epiar/commit/6f62c337480d822c1bd42ab3b9259d091aec2670
Author: Christopher Thielen <cthielen at christopher-thielens-macbook-pro.local>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  M Source/Input/input.cpp

Log Message:
-----------
Cleaned up spacing issues in input.cpp.

Commit: 36722aeb2dac6fb97b5500b2ed0b7284258047f8
    http://github.com/knowknowledge/Epiar/commit/36722aeb2dac6fb97b5500b2ed0b7284258047f8
Author: Christopher Thielen <cthielen at christopher-thielens-macbook-pro.local>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  M Source/Graphics/font.cpp
  M Source/Graphics/font.h
  M Source/Graphics/video.h

Log Message:
-----------
Added a Rectangle class to video.h and made all Font render functions returning the bounding box as a Rectangle. This is needed mostly for UI code when you must draw based on the size of the text, e.g. to know text wrapping or where to draw a blinking cursor.

Commit: a64d534dbdcd351f3dd38598a81a37cb920b1371
    http://github.com/knowknowledge/Epiar/commit/a64d534dbdcd351f3dd38598a81a37cb920b1371
Author: Christopher Thielen <cthielen at christopher-thielens-macbook-pro.local>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  M Source/Graphics/font.cpp

Log Message:
-----------
Oops, had the rectangle returns giving negative widths. Fixed.

Commit: a40ab4e085558990bd8efb48e35929badbb7b84c
    http://github.com/knowknowledge/Epiar/commit/a40ab4e085558990bd8efb48e35929badbb7b84c
Author: Christopher Thielen <cthielen at christopher-thielens-macbook-pro.local>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  M Source/UI/ui.cpp
  M Source/UI/ui_textbox.cpp
  M Source/UI/ui_textbox.h
  M Source/UI/ui_widget.cpp
  M Source/UI/ui_widget.h

Log Message:
-----------
Textbox is working! It's still a little scratchy but works well overall. Press 'g' in game to see the UI demo.

Commit: 885182b59ed29245672acb38f29dd195f6f1d0a5
    http://github.com/knowknowledge/Epiar/commit/885182b59ed29245672acb38f29dd195f6f1d0a5
Author: Christopher Thielen <cthielen at christopher-thielens-macbook-pro.local>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  M .gitignore

Log Message:
-----------
Added the main Epiar binary to gitignore (it wasn't there?)

Commit: 474ab35b7130010a7e7975f7a03cc278c334a16b
    http://github.com/knowknowledge/Epiar/commit/474ab35b7130010a7e7975f7a03cc278c334a16b
Author: Christopher Thielen <cthielen at new-host-3.home>
Date:   2009-12-28 (Mon, 28 Dec 2009)

Changed paths:
  M Source/Input/input.cpp
  M Source/Input/input.h

Log Message:
-----------
Renamed Input::Handle to Input::HandlePlayerInput to better reflect its function.

Commit: 1779649c7b3f75a4f4b0d2b4ceb5f48923770e1f
    http://github.com/knowknowledge/Epiar/commit/1779649c7b3f75a4f4b0d2b4ceb5f48923770e1f
Author: Christopher Thielen <cthielen at new-host-3.home>
Date:   2009-12-28 (Mon, 28 Dec 2009)

Changed paths:
  M Resources/Scripts/universe.lua
  M Source/Input/input.cpp
  M Source/Input/input.h
  M Source/Utilities/lua.cpp

Log Message:
-----------
Trying to clean up input (KEYDOWN vs KEYTYPED) and the way Lua handles it, e.g. pause() should only respond to a KEYTYPED event, not a KEYDOWN event, else our UI will never work.

Commit: 4202e2297caa15521cfe132b78f3fa69dde2e9b0
    http://github.com/knowknowledge/Epiar/commit/4202e2297caa15521cfe132b78f3fa69dde2e9b0
Author: Christopher Thielen <cthielen at new-host-3.home>
Date:   2009-12-28 (Mon, 28 Dec 2009)

Changed paths:
  M Source/UI/ui.cpp
  M Source/UI/ui_textbox.cpp
  M Source/UI/ui_textbox.h
  M Source/UI/ui_widget.cpp
  M Source/UI/ui_widget.h

Log Message:
-----------
More UI Textbox work. Textbox now responds to KEYTYPED events, and propers handles spaces, backspaces, and capital letters.

Commit: b36e13b943713ed9720d84dc5c449b90beb76fda
    http://github.com/knowknowledge/Epiar/commit/b36e13b943713ed9720d84dc5c449b90beb76fda
Author: Christopher Thielen <cthielen at new-host.home>
Date:   2009-12-28 (Mon, 28 Dec 2009)

Changed paths:
  M Makefile.am
  M Source/UI/ui.cpp
  M Source/UI/ui.h
  M Source/UI/ui_button.cpp
  M Source/UI/ui_button.h
  A Source/UI/ui_checkbox.cpp
  A Source/UI/ui_checkbox.h
  M Source/UI/ui_textbox.cpp

Log Message:
-----------
Implemented the basic UI checkbox. Still needs support for a label on the side and the Lua callbacks, but the C++ side of things works.

Commit: 793360df208a8a0a36b89a7aa82a4849ff13e706
    http://github.com/knowknowledge/Epiar/commit/793360df208a8a0a36b89a7aa82a4849ff13e706
Author: Matt Zweig <thezweig at gmail.com>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M Source/Input/input.cpp
  M Source/Input/input.h
  M Source/Utilities/lua.cpp
  M Source/Utilities/lua.h

Log Message:
-----------
Moves Key Registration to Input rather than Lua.

Commit: c65760772d0edb61a9b0fa73deb73ee57083d514
    http://github.com/knowknowledge/Epiar/commit/c65760772d0edb61a9b0fa73deb73ee57083d514
Author: Matt Zweig <thezweig at gmail.com>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M Resources/Scripts/universe.lua
  M Source/Input/input.cpp
  M Source/Input/input.h

Log Message:
-----------
Changes Lua callbacks to trigger on Events rather than just keys.

This allows Lua to register functions to trigger off of specific key
states (KEYUP, KEYDOWN, KEYPRESSED, KEYTYPED).

In theory this supports Mouse states as well, but they would have to be
pixel perfect or the event would be missed.

Commit: aa4afa652868e9b2be490bc73b528a4578ab661c
    http://github.com/knowknowledge/Epiar/commit/aa4afa652868e9b2be490bc73b528a4578ab661c
Author: Matt Zweig <thezweig at gmail.com>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M Resources/Scripts/universe.lua
  M Source/Input/input.cpp
  M Source/Utilities/lua.cpp

Log Message:
-----------
Moves all Player actions to Registered Key Mappings

The keyDown list was badly named (easily confused with KEYDOWN) so it was renamed heldKeys.

The heldKeys list is pushed to the end of the events list as KEYPRESSED events.  KEYPRESSED events will trigger for as long as that key remains pressed down.

The Lua Key mappings are accpeting numbers now rather than characters.  I don't know how to accept either type.

Commit: 488578c6450cc8e09fbd4b1924609d8cc09fb5d8
    http://github.com/knowknowledge/Epiar/commit/488578c6450cc8e09fbd4b1924609d8cc09fb5d8
Author: Christopher Thielen <cthielen at new-host.home>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M configure.in

Log Message:
-----------
Freetype and FTGL turned on by default. We need to eventually, maybe now, remove afont, as FTGL has proven to be the better choice.

Commit: 35351f634c170c33033adbc2852d9f6316a0a155
    http://github.com/knowknowledge/Epiar/commit/35351f634c170c33033adbc2852d9f6316a0a155
Author: Matt Zweig <thezweig at gmail.com>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M Resources/Scripts/universe.lua
  M Source/Input/input.cpp
  M Source/UI/ui_lua.cpp
  M Source/UI/ui_lua.h

Log Message:
-----------
Moved the ui_demo to a Lua function.

Adds code for creating simple checkboxes from Lua.

Commit: b1181e8e98d86351d9f55ae0c1aae839918a1aea
    http://github.com/knowknowledge/Epiar/commit/b1181e8e98d86351d9f55ae0c1aae839918a1aea
Author: Matt Zweig <thezweig at gmail.com>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M Resources/Scripts/universe.lua
  M Source/UI/ui_checkbox.h
  M Source/UI/ui_lua.cpp
  M Source/UI/ui_lua.h

Log Message:
-----------
Adds Checkbox getter and setter.

Commit: eab148bcb0caf396b1ddd9dc7e0b5426ed522a99
    http://github.com/knowknowledge/Epiar/commit/eab148bcb0caf396b1ddd9dc7e0b5426ed522a99
Author: Matt Zweig <thezweig at gmail.com>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M Resources/Scripts/universe.lua
  M Source/UI/ui_lua.cpp
  M Source/UI/ui_lua.h
  M Source/UI/ui_textbox.h

Log Message:
-----------
Adds Textbox getter and setter.

The old UI_Lua function setText was renamed setLabel.

Commit: 5dd48b416889a6db9cf0b9af3777ac3dd9c95fc3
    http://github.com/knowknowledge/Epiar/commit/5dd48b416889a6db9cf0b9af3777ac3dd9c95fc3
Author: Matt Zweig <thezweig at gmail.com>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M Resources/Scripts/universe.lua
  M Source/Input/input.cpp

Log Message:
-----------
Allows RegisterKey to accept numbers and characters.

Commit: 2bee2d97ac21412ce1a0099f77d42e9847975f65
    http://github.com/knowknowledge/Epiar/commit/2bee2d97ac21412ce1a0099f77d42e9847975f65
Author: Matt Zweig <thezweig at gmail.com>
Date:   2009-12-30 (Wed, 30 Dec 2009)

Changed paths:
  M Source/UI/ui.cpp

Log Message:
-----------
Process UI focus backwards so that closer widgets get focus first.

Commit: 09c283b631253f4ea55a90f20c426ab2827b0d8d
    http://github.com/knowknowledge/Epiar/commit/09c283b631253f4ea55a90f20c426ab2827b0d8d
Author: Matt Zweig <thezweig at gmail.com>
Date:   2009-12-30 (Wed, 30 Dec 2009)

Changed paths:
  M .gitignore
  M ChangeLog
  M Makefile.am
  M Resources/Definitions/engines-default.xml
  M Resources/Definitions/options.xml
  M Resources/Scripts/tag.lua
  M Resources/Scripts/universe.lua
  M Source/Engine/hud.cpp
  M Source/Graphics/font.cpp
  M Source/Graphics/font.h
  M Source/Graphics/image.cpp
  M Source/Graphics/video.h
  M Source/Input/input.cpp
  M Source/Input/input.h
  M Source/Sprites/sprite.cpp
  M Source/UI/ui.cpp
  M Source/UI/ui.h
  M Source/UI/ui_button.cpp
  M Source/UI/ui_button.h
  A Source/UI/ui_checkbox.cpp
  A Source/UI/ui_checkbox.h
  M Source/UI/ui_lua.cpp
  M Source/UI/ui_lua.h
  M Source/UI/ui_picture.h
  M Source/UI/ui_textbox.cpp
  M Source/UI/ui_textbox.h
  M Source/UI/ui_widget.cpp
  M Source/UI/ui_widget.h
  M Source/UI/ui_window.cpp
  M Source/UI/ui_window.h
  M Source/Utilities/camera.cpp
  M Source/Utilities/log.cpp
  M Source/Utilities/log.h
  M Source/Utilities/lua.cpp
  M Source/Utilities/lua.h
  M Source/main.cpp
  M configure.in

Log Message:
-----------
Merge branch 'UI'