summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/glwrapper.h
Commit message (Collapse)AuthorAgeFilesLines
* Allow minimap colour options to be set with hex codes and used in WebTiles.Pekka Lampila2014-02-171-28/+0
| | | | | | | | | | | | | | | | This changes the default WebTiles minimap colours to match local tiles. To get the previous default values use: tile_floor_col = #a9a9a9 tile_door_col = #a52a2a tile_item_col = #008000 tile_friendly_col = #ee9090 tile_peaceful_col = #ee9090 tile_plant_col = #006400 tile_upstairs_col = #0000ff tile_downstairs_col = #ff00ff tile_excl_centre_col = #00008b tile_excluded_col = #008b8b
* Drop double newlines where they seem to serve no purpose.Adam Borowski2013-12-211-1/+0
| | | | | Sometimes, they're there to emphasize a break between two sections of code, which is good. In a majority of cases, though, they're just inconsistent.
* Android port.frogbotherer2012-09-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* more efficient font rendering using glTexSubImage2Dfrogbotherer2012-07-081-1/+2
|
* First prototype of webtiles.Florian Diebold2011-06-261-1/+1
| | | | | | Conflicts: crawl-ref/source/startup.cc
* Remove extra semicolons (Luca).Robert Vollmert2010-07-291-4/+4
|
* Bring sanity to enums by making them diffable/patchable.Adam Borowski2010-06-081-1/+1
|
* Clean up GL code function parameters.Enne Walker2010-05-141-5/+3
| | | | | | | 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-5/+5
|
* Clean up storage of vertex colours in GLWRect.Enne Walker2010-05-141-11/+11
| | | | | | 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-14/+9
|
* Add "current colour" to GLState.Enne Walker2010-05-141-2/+4
| | | | | This simplifies code that was setting and unsetting the global current colour manually.
* Reduce header dependencies on glwrapper.h.Enne Walker2010-05-141-7/+2
|
* Expose GL state to draw call API.Enne Walker2010-05-141-2/+2
| | | | | This avoids weird global state setting and then querying in the next function.
* Remove unused GL_V4F vertex format.Enne Walker2010-05-141-28/+1
|
* Rename vert buffer 'push' to 'add' for clarity.Enne Walker2010-05-141-5/+4
|
* Code cleanup for triangles branch.Enne Walker2010-05-141-6/+6
| | | | Applying standards, simplifying code, removing redundant comments.
* Remove unused polygon winding enum.Enne Walker2010-05-141-9/+0
| | | | | This doesn't need to be exposed as all implementations handle winding internally.
* Remove unused 'flush' option on buffer drawing.Enne Walker2010-05-141-2/+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 QUADS from supported drawing modes.Ixtli2010-05-141-3/+1
| | | | Signed-off-by: Enne Walker <enne.walker@gmail.com>
* Removed GLStateManager::draw and GLPrimitive.Ixtli2010-05-141-27/+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-0/+33
| | | | | | | | | 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>
* Struct changes. Added a winding query.Ixtli2010-05-141-8/+117
| | | | | | | | Added a GLWRect for passing rectangles generically. Moved VColour into glwrapper.h; it will survive the purging. Can now ask GLStateManager what winding it's using. Signed-off-by: Enne Walker <enne.walker@gmail.com>
* glwrapper.h: check for ASSERTS, instead of DEBUG for _valid()Steven Noonan2010-04-251-1/+1
| | | | | | In glwrapper.cc, we check for ASSERTS. This makes it consistent. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Fix GLPrimitive to use a size_t, as returned by sizeof.Enne Walker2010-04-241-2/+2
|
* Move specific create funcs out of generic files.Enne Walker2010-04-241-0/+2
| | | | | | | 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-10/+10
| | | | | | 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.
* Moved comment related to GLState to glwrapper.hIxtli2010-04-241-0/+5
|
* Made glwrapper use proper dynamic dispatch for modularity.Ixtli2010-04-241-22/+27
|
* Cleaned up includes and #ifdefs. Made uiwrapper conditionally support SDL.Ixtli2010-04-241-5/+3
|
* Prettied up glwrapper set_transformIxtli2010-04-241-1/+2
|
* Cleaned up glwrapperIxtli2010-04-241-8/+8
|
* Removed drawTextBox and drawColoredBox and replaced them with calls to ↵Ixtli2010-04-241-8/+32
| | | | draw_primitive. Also added GLStateManager methods for setting the current drawing color, and a GLW_4VF struct for completeness.
* More camel case to underscores_as_spacesIxtli2010-04-241-10/+10
|
* Updated files to conform to crawl coding standardsIxtli2010-04-241-11/+10
|
* removed opengl from UIWrapper, fixed indenting in uiwrapper-sdl and added a ↵Ixtli2010-04-241-2/+3
| | | | resizeWindow method in GLStateManager
* Added GLPrimitive to glwrapper, condenced all vert-drawing methods to ↵Ixtli2010-04-241-23/+36
| | | | | | drawGLPrimitives and then updated tilebuf, font, reg, and sdl to use it propperly. As well, tilebuf's VertBuffer::draw() method needed to be changed to allow passing to pre-render transformations (used in submerged tile rendering.)
* Moved MipMapOptions to glwrapper for modularityIxtli2010-04-241-2/+9
|
* Removed tiletex dependancy on SDL_opengl and updated glwrapper.h/cc to ↵Ixtli2010-04-241-0/+10
| | | | support it
* Removed direct calls to opengl from tilefont and updated glwrapper accordingly.Ixtli2010-04-241-0/+9
|
* Updated tilesdl.cc to use glwrapper instead of direct gl calls.Ixtli2010-04-241-0/+4
|
* Added drawing functions and fixed many syntax errors in glwrapper.cc/hIxtli2010-04-241-8/+38
|
* Added glwrapper, which expands the GLStateManager class from tilebuf into a ↵Ixtli2010-04-241-0/+44
(g)raphics (l)ibrary wrapper. Also updated the makefile to include it when making with GL=y