lp:~widelands-dev/widelands/graphics
Created by
Nicolai Hähnle
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
On hold
for merging
into
lp:widelands
- Widelands Developers: Pending requested
-
Diff: 5308 lines (+3726/-434)50 files modifiedcmake/codecheck/rules/correct_include_order (+4/-3)
data/shaders/blit.fp (+3/-4)
data/shaders/blit.vp (+5/-4)
data/shaders/blit_gl4.vp (+70/-0)
data/shaders/minimap_gl4.fp (+108/-0)
data/shaders/minimap_gl4.vp (+11/-0)
data/shaders/road_gl4.vp (+89/-0)
data/shaders/terrain_common_gl4.vp (+59/-0)
data/shaders/terrain_gl4.fp (+58/-0)
data/shaders/terrain_gl4.vp (+157/-0)
src/graphic/CMakeLists.txt (+4/-0)
src/graphic/game_renderer.cc (+107/-92)
src/graphic/game_renderer.h (+35/-16)
src/graphic/game_renderer_gl4.cc (+194/-0)
src/graphic/game_renderer_gl4.h (+92/-0)
src/graphic/gl/blit_program.cc (+297/-6)
src/graphic/gl/blit_program.h (+5/-59)
src/graphic/gl/dither_program.cc (+29/-30)
src/graphic/gl/dither_program.h (+5/-6)
src/graphic/gl/fields_to_draw.h (+298/-80)
src/graphic/gl/initialize.cc (+2/-0)
src/graphic/gl/road_program.cc (+17/-16)
src/graphic/gl/road_program.h (+4/-3)
src/graphic/gl/streaming_buffer.h (+173/-0)
src/graphic/gl/terrain_program.cc (+15/-13)
src/graphic/gl/terrain_program.h (+2/-2)
src/graphic/gl/terrain_program_gl4.cc (+1065/-0)
src/graphic/gl/terrain_program_gl4.h (+352/-0)
src/graphic/gl/utils.cc (+79/-33)
src/graphic/gl/utils.h (+29/-11)
src/graphic/image_io.cc (+1/-1)
src/graphic/minimap_layer.h (+45/-0)
src/graphic/minimap_renderer.cc (+129/-8)
src/graphic/minimap_renderer.h (+49/-25)
src/graphic/render_queue.cc (+36/-5)
src/graphic/render_queue.h (+8/-1)
src/graphic/texture.cc (+5/-3)
src/graphic/texture.h (+20/-1)
src/logic/map.cc (+9/-1)
src/logic/map.h (+13/-0)
src/logic/map_objects/map_object.h (+7/-4)
src/logic/map_objects/tribes/road_textures.h (+7/-0)
src/logic/map_objects/world/terrain_description.cc (+1/-1)
src/logic/map_objects/world/terrain_description.h (+1/-1)
src/logic/player.cc (+11/-0)
src/logic/player.h (+5/-0)
src/wlapplication.cc (+1/-0)
src/wui/mapview.cc (+1/-1)
src/wui/minimap.cc (+8/-3)
src/wui/minimap.h (+1/-1)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:widelands