summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/glwrapper-ogl.cc
Commit message (Collapse)AuthorAgeFilesLines
* Drop pointless empty lines after or before a brace.Adam Borowski2013-12-211-1/+0
| | | | | I left them only where the contents is not indented, like in a namespace or a template.
* More formatting fixes for return (...);Neil Moore2013-11-151-1/+1
|
* Include debug.h earlier.Adam Borowski2013-04-261-2/+0
| | | | | Via externs.h -> bitary.h, it was effectively included by everything anyway, and this way simplifies include chains.
* Formatting fixes.Neil Moore2012-12-281-3/+3
|
* New option to have zoomed textures filtered: tile_filter_scaling.Raphael Langella2012-10-081-2/+5
|
* Android port.frogbotherer2012-09-081-6/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2 files are added to the root of the repository: * AndroidAppSettings.cfg: settings file required for Android SDL port. Will change on each minor release to reset configuration. * AndroidBuild.sh: script called by the Android SDL port to commence building the game itself It might be nice to be able to move them elsewhere, but for now, their presence here is required. The build process is documented in docs/develop/android.txt There's a TOUCH_UI compiler flag which sets all the things specific to a touch screen interface. There has been a large amount of changes in the Makefile for redefining where the dat/, saves/, etc. directories go, because the "install" part of the make isn't the final destination for these files under Android - the environment we deploy to is a separate device from the build environment. There is also a number of changes to the tiles interface. Some are specific to the TOUCH_UI, but others are also changed in USE_TILE_LOCAL. Touch only: * 'a'bilities menu goes straight to menu without prompting first * tap menu header to toggle/submit * menu instead of prompt to select which corpse to butcher * same for eating food from the floor (those 2 could go in local tiles too) * show_more defaults to false and less --more-- messages * pickup mode defaults to menu * defaults for tile_layout_priority is different (commands are more important than inventory) * popup for yes/no prompts, level-up stat gain and swapping rings (should be used for all prompts, and probably local tiles too) * spell casting: force selection menu * map mode: left-click rather than right-click for mouse mode; autotravel on left-click removed * remove skills training and memorisation panels Also local tiles (some could also be integrated in webtiles): * commands below description are clickable * clickable shopping menu (uses PrecisionMenu) * split the command panel in 2 (common actions and system commands) * add a map command panel * tapping or left-clicking the player is smarter: * picks up the item if there's one on the tile, otherwise * shows pick-up menu if there's several items on the tile, otherwise * traverses stairs (or enters a portal or shop) if one is present, otherwise * prays if an altar is present, otherwise * waits one turn * right-clicking the map enters map mode and brings the map commands tab to the front; map mode stays until exited rather than upon release of mouse Some more details can be found in android_patch_notes.txt on #5677 (although some TODOs are already obsolete). Signed-off-by: Raphael Langella <raphael.langella@gmail.com>
* Formatting fixes.Adam Borowski2012-08-081-1/+1
|
* Merge branch 'unicode-tiles'Adam Borowski2012-07-111-3/+8
|\ | | | | | | | | | | It lacks an actual font yet, but I realized we need to check if drivers people use actually support sub-textures -- and if not, there'll be some rethinking needed.
| * more efficient font rendering using glTexSubImage2Dfrogbotherer2012-07-081-3/+8
| |
* | Some more return deparenthesization.Adam Borowski2012-07-051-1/+1
| |
* | Drop parentheses around scalar values in "return".Adam Borowski2012-07-051-1/+1
|/
* Drop pointless braces after if/for/while everywhere.Adam Borowski2012-04-201-2/+0
|
* Merge branch 'webtiles'Adam Borowski2011-07-101-2/+2
|\
| * First prototype of webtiles.Florian Diebold2011-06-261-2/+2
| | | | | | | | | | | | Conflicts: crawl-ref/source/startup.cc
* | cppcheck: fix inefficient checking for emptiness.Adam Borowski2011-07-051-1/+1
|/ | | | | On some STL structures size() is slow. I did not bother limitting sed, so innocent bystanders got pulled into the machine, but there's no loss.
* Convert ASSERT(!"foo") to die("foo").Adam Borowski2011-01-111-2/+2
|
* Conditionalize glOrthox(), not all OpenGLs have it.Adam Borowski2010-07-281-0/+4
| | | | (and OpenGLES doesn't have ordinary glOrtho(), just -f and -x)
* OpenGLES porting, part 1.Adam Borowski2010-07-281-3/+15
|
* Clean up GL code function parameters.Enne Walker2010-05-141-21/+8
| | | | | | | Remove any non-const-reference parameters. Change const pointer parameters to const reference parameters. Change all draw(NULL, NULL) calls to just draw(). Also, refactor to remove pretranslate and prescale parameters from draw calls.
* Renaming struct GLWRect to be class GLWPrim.Enne Walker2010-05-141-3/+3
|
* Clean up storage of vertex colours in GLWRect.Enne Walker2010-05-141-12/+6
| | | | | | Storing member variable pointers to data, even const ones, is sketchy. Better to depend on compiler optimizations to eliminate redundant variable copies.
* Clean up unions in glwrapper.h.Enne Walker2010-05-141-5/+3
|
* Add "current colour" to GLState.Enne Walker2010-05-141-10/+6
| | | | | This simplifies code that was setting and unsetting the global current colour manually.
* Expose GL state to draw call API.Enne Walker2010-05-141-3/+3
| | | | | This avoids weird global state setting and then querying in the next function.
* Fixing incorrect OpenGL state logic.Enne Walker2010-05-141-1/+2
|
* Remove unused GL_V4F vertex format.Enne Walker2010-05-141-1/+1
|
* Rename vert buffer 'push' to 'add' for clarity.Enne Walker2010-05-141-6/+5
|
* Code cleanup for triangles branch.Enne Walker2010-05-141-103/+83
| | | | Applying standards, simplifying code, removing redundant comments.
* Remove unused 'flush' option on buffer drawing.Enne Walker2010-05-141-4/+1
| | | | | It's not really used anywhere at this point, and it's better to call clear explicitly when the draw buffer needs to be refilled.
* Removed GLStateManager::draw and GLPrimitive.Ixtli2010-05-141-48/+0
| | | | | | This will force all drawing to be done through VertBuffer. Signed-off-by: Enne Walker <enne.walker@gmail.com>
* Added GLShapeBuffer. Changed GLState, Manager.Ixtli2010-05-141-33/+281
| | | | | | | | | Added convenience methods to GLState. Changed GLStateManager to check current state before using glEnable in case those commands are slow, as they are being called nearly ever draw. (Note: GLShapeBuffer is not currently used.) Signed-off-by: Enne Walker <enne.walker@gmail.com>
* Move specific create funcs out of generic files.Enne Walker2010-04-241-0/+19
| | | | | | | glwrapper-ogl.cc, windowmanager-sdl.cc, and fontwrapper-ft.cc now contain the static functions for their parent class's factory create. This allows new implementations to be added without requiring modification of the generic file (with #ifdefs).
* General coding standards update.Enne Walker2010-04-241-18/+18
| | | | | | No spaces on parens. Line up function params. Sort includes more rationally. Put curly braces on their own line. Don't C-style typedef enum and structs. Put if-clauses on their own line.
* Merged cgcontext into uiwrapper-sdlIxtli2010-04-241-0/+1
|
* Made glwrapper use proper dynamic dispatch for modularity.Ixtli2010-04-241-72/+17
|
* Cleaned up includes and #ifdefs. Made uiwrapper conditionally support SDL.Ixtli2010-04-241-1/+1
|
* Fixed -h file names referring to specific implementations.Ixtli2010-04-241-0/+273
The makefile should now name the .o's based on what libraries you're using, as well.