Skip to content
This repository has been archived by the owner on Oct 1, 2022. It is now read-only.

Many mostly graphics related changes #767

Open
wants to merge 111 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
1b42a92
speedup game start
paulwedeck Jan 22, 2019
0380223
reduce functions calls per draw command
paulwedeck Jan 22, 2019
951e365
fix GLFW window resizing, minor refactoring for ContextCreators
paulwedeck Jan 24, 2019
a97fc46
minimal refactoring
paulwedeck Jan 24, 2019
220c4fe
fix resizing while using glfw, make glfw fps limit aware, add option …
paulwedeck Jan 25, 2019
e496f22
rename resize_gl to resizeContext
paulwedeck Feb 1, 2019
c8e2e35
inline bindFormat to improve performance
paulwedeck Feb 1, 2019
77587ea
fix shadows in MapCreator
paulwedeck Feb 2, 2019
d6daee1
optimize PartitionManger#removePositionTo
paulwedeck Feb 2, 2019
4f82c29
bundle multiple updateGeometry calls into one
paulwedeck Feb 3, 2019
30c7e14
increase accuracy of FramerateComputer
paulwedeck Feb 3, 2019
ca14ccc
make dim logic independent from rendering
paulwedeck Feb 4, 2019
2f4f6ff
move fowWritten logic to Background
paulwedeck Feb 4, 2019
90ea7d8
stop updating fow while pausing
paulwedeck Feb 8, 2019
3b32693
move UpdateGeometryCache to go.graphics
paulwedeck Feb 8, 2019
be6b46d
stop rewinding buffers inside and after updateGeometry
paulwedeck Feb 8, 2019
5cea18b
fix savegame loading
paulwedeck Feb 9, 2019
bf07942
fix terrain type and height updates, guard fowWritten access
paulwedeck Feb 9, 2019
cdef778
fix GLES11DrawContext#updateGeometryAt
paulwedeck Feb 10, 2019
7bdc23f
fill asyncBufferBuilding==true code path, replace backgroundColorChan…
paulwedeck Feb 15, 2019
ff34e58
change fowWritten from boolean[][] BitSet
paulwedeck Feb 16, 2019
f2037e1
split updated in AdvancedUpdateGeometryCache in multiple BitSets
paulwedeck Feb 16, 2019
83476cc
reduce updateGeometry calls in AndroidTextDrawer
paulwedeck Feb 16, 2019
d8a4bfe
make FOG_OF_WAR_DIM independent of FO_OG_WAR_DIM_FRAMERATE
paulwedeck Feb 16, 2019
6207c2e
fix some warnings and formating
paulwedeck Feb 16, 2019
7652659
expose gamespeed in IGameClock and adapt fow dimming to it
paulwedeck Feb 16, 2019
bdf4cc5
minor changes
paulwedeck Feb 16, 2019
aef34dc
stop creating textures from heap buffers
paulwedeck Feb 23, 2019
706036e
remove unused fpsLimit in MapContent
paulwedeck Feb 23, 2019
11fe17f
minor refactoring, fix DatFileViewer
paulwedeck Jun 11, 2019
19e7045
improve DatFileViewer
paulwedeck Jun 11, 2019
e52e739
Fix Arrows
paulwedeck Jun 11, 2019
e624319
Stop attacking dead enemies
paulwedeck Jun 11, 2019
c2aeab3
stop adding getOffset?() to every render location, just add this offs…
paulwedeck Jun 12, 2019
d23541c
Limit updated locations to actually existing ones
paulwedeck Jun 12, 2019
3734755
add game speed and pause menu
paulwedeck Jun 13, 2019
3dae4b6
Remove unused MultiImage* stuff
paulwedeck Jun 14, 2019
8aa9d9e
reduce number of created textures
paulwedeck Jun 14, 2019
194b836
minor changes to Shared* classes
paulwedeck Jun 15, 2019
40ffd34
Stop attacking dead enemies with infrantry
paulwedeck Jun 15, 2019
2ec2978
increase resolution of MapContents time measurement and add depth buf…
paulwedeck Jun 15, 2019
06af0a3
improve z-order in MapObjectDrawer
paulwedeck Jun 15, 2019
04a74eb
change settlers z order
paulwedeck Jun 16, 2019
d98c470
allow GLDrawContext to notice that the frame is ready
paulwedeck Jun 16, 2019
125b075
small shader refactoring
paulwedeck Jun 16, 2019
2f6fa0f
remove glFinish because of performance impact
paulwedeck Jun 17, 2019
2a73e5d
add GL(ES) 3.1 path that merge multiple draw calls with different uni…
paulwedeck Jun 18, 2019
70882a8
rename GL(ES)3 render path to GL(ES)3.2 because it is
paulwedeck Jun 18, 2019
aca374a
add drawUnified2DArray render path that is currently only used by pla…
paulwedeck Jun 20, 2019
40f192e
stop compiling unifiedArray shader if its not possible
paulwedeck Jun 20, 2019
7c711b4
move GLES31 path to GLES30
paulwedeck Jun 21, 2019
af1acfe
some bug fixing involving legacy opengl
paulwedeck Jun 21, 2019
9489709
fix shadow_depth value of multi shader
paulwedeck Jun 22, 2019
0f58019
improve error handling in GLContainer and ContextCreators
paulwedeck Jun 23, 2019
cf686d8
put GLES 3.0 stuff of GLES20DrawContext into GLES30DrawContext,
paulwedeck Jun 23, 2019
0243230
remove wrong comments
paulwedeck Jun 23, 2019
7a53392
just some small cleanup
paulwedeck Jun 23, 2019
51fe5f3
fix android Background
paulwedeck Jun 24, 2019
04cee55
minor refactoring
paulwedeck Jun 30, 2019
8775fc5
some textdrawer changes
paulwedeck Jul 1, 2019
50c996d
fix drawing of buildings that are in construction
paulwedeck Jul 6, 2019
1a0349e
stop updating buffers to show progress of BarFill
paulwedeck Jul 7, 2019
4ff1620
fix z of in construction buildings
paulwedeck Jul 7, 2019
e15d7ed
some minor LWJGL improvments
paulwedeck Jul 7, 2019
0d60c23
Rename GeometryHandle to BufferHandle
paulwedeck Jul 12, 2019
ef52bb5
rewrite of all render paths
paulwedeck Jul 16, 2019
0b0ea33
rename *20DrawContext and *20DrawContext to *DrawContext
paulwedeck Jul 16, 2019
f8e6910
fix non-debug WGL and default context creation
paulwedeck Jul 16, 2019
747d0ee
fix construction progress drawing
paulwedeck Jul 17, 2019
f6361e5
fix drawOnlyShadow and drawOnlyImage in SettlerImage
paulwedeck Jul 17, 2019
c3a39ec
automate caching
paulwedeck Jul 17, 2019
ce3e03e
make AndroidTextDrawer more LWJGLTextDrawer like
paulwedeck Jul 17, 2019
1ea3fbc
Merge branch 'master' of githubpaul:jsettlers/settlers-remake into gr…
paulwedeck Jul 17, 2019
ceab17b
fix dock drawing
paulwedeck Jul 17, 2019
3c73174
fix font drawing after a while
paulwedeck Jul 17, 2019
bc0d979
fix building image in UI panel
paulwedeck Jul 18, 2019
c3efe76
change spaces to tabs in some shaders, fix colored font drawing
paulwedeck Jul 18, 2019
419b2e2
Share more code between LWJGL and Android TextDrawer,
paulwedeck Jul 20, 2019
b967b72
Merge branch 'master' into graphics
paulwedeck Jul 20, 2019
2dbcda6
fix stock drawing
paulwedeck Jul 24, 2019
13773db
Merge branch 'graphics' of github:paulwedeck/settlers-remake into gra…
paulwedeck Jul 24, 2019
1136184
fix filterBounds inline
paulwedeck Jul 25, 2019
d540bde
update test files
paulwedeck Jul 25, 2019
47265fd
fix DistancesCalculationAlgorithm
paulwedeck Jul 25, 2019
823a0eb
update test files again
paulwedeck Jul 25, 2019
0d0ec52
update test files again the 3rd
paulwedeck Jul 25, 2019
26330b5
merge master
paulwedeck Sep 14, 2019
d24ed35
fix too small framebuffers when using native scaling,
paulwedeck Sep 22, 2019
28e9293
fix SettingsSlider documentation
paulwedeck Sep 22, 2019
ad14160
some bug/potential bug/strange driver behavior fixing
paulwedeck Oct 12, 2019
2074e26
some font/panel size fixing
paulwedeck Oct 13, 2019
9e0eeb9
improve use of EGL_KHR_debug
paulwedeck Oct 13, 2019
c282e88
replace most gl imports with static imports
paulwedeck Oct 13, 2019
5a169c1
fix ProgressBar font
paulwedeck Oct 13, 2019
eff4bea
improve error reporting while context creation
paulwedeck Oct 21, 2019
3a24b4c
fix GLFW canvas size
paulwedeck Oct 25, 2019
7f3c871
fix GLFW canvas size
paulwedeck Oct 25, 2019
0f42c3e
Remove forgotten debug code
paulwedeck Oct 31, 2019
28b1d93
some neccessary stuff for vulkan without actually adding this dependency
paulwedeck Jan 15, 2020
cfd76e8
Merge branch 'graphics' of github:paulwedeck/settlers-remake into gra…
paulwedeck Jan 15, 2020
d61a3d6
add lwjgl based vulkan render path
paulwedeck Jan 15, 2020
df0c60f
some minor changes
paulwedeck Apr 20, 2020
e15af01
fix glfw-vulkan offscreen rendering
paulwedeck Apr 20, 2020
afceaef
fix UnifiedDrawCalls buffer size
paulwedeck Apr 20, 2020
bf67e89
Use UTF-8 encoding in gradle compilation
andreas-eberle Apr 25, 2020
f2e85b6
revert parts of 'speedup game start' 1b42a92b7f2423e17da5e961f28325db…
paulwedeck Apr 25, 2020
cc632b8
Merge branch 'graphics' of github:paulwedeck/settlers-remake into gra…
paulwedeck Apr 25, 2020
4205e6a
fix fullscreen toggle with vulkan
paulwedeck Apr 29, 2020
a34192c
Some stuff that helps with swing
paulwedeck May 2, 2020
5550053
fix newline in AbstractTextDrawer
paulwedeck May 2, 2020
a2ab42d
add textdrawer todo
paulwedeck Apr 29, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
reduce functions calls per draw command
  • Loading branch information
paulwedeck committed Jan 22, 2019
commit 0380223ae8fd5e4378edeed4df323d286ee0db3f
Original file line number Diff line number Diff line change
@@ -104,7 +104,7 @@ public void draw2D(GeometryHandle geometry, TextureHandle texture, int primitive
}

if(gles3) {
bindFormat(geometry.getInternalFormatId());
bindFormat(geometry.vao);
} else {
bindGeometry(geometry);
specifyFormat(geometry.getFormat());
@@ -151,7 +151,7 @@ public void drawUnified2D(GeometryHandle geometry, TextureHandle texture, int pr
GLES20.glUniform3fv(lastProgram.ufs[TRANS], 2, new float[] {x, y, z, sx, sy, sz}, 0);

if(gles3) {
bindFormat(geometry.getInternalFormatId());
bindFormat(geometry.vao);
} else {
bindGeometry(geometry);
specifyFormat(geometry.getFormat());
Original file line number Diff line number Diff line change
@@ -108,7 +108,7 @@ public void draw2D(GeometryHandle geometry, TextureHandle texture, int primitive
}

if(glcaps.GL_ARB_vertex_array_object) {
bindFormat(geometry.getInternalFormatId());
bindFormat(geometry.vao);
} else {
bindGeometry(geometry);
specifyFormat(geometry.getFormat());
@@ -155,7 +155,7 @@ public void drawUnified2D(GeometryHandle geometry, TextureHandle texture, int pr
GL20.glUniform3fv(lastProgram.ufs[TRANS], new float[] {x, y, z, sx, sy, sz});

if(glcaps.GL_ARB_vertex_array_object) {
bindFormat(geometry.getInternalFormatId());
bindFormat(geometry.vao);
} else {
bindGeometry(geometry);
specifyFormat(geometry.getFormat());
2 changes: 1 addition & 1 deletion go.graphics/src/main/java/go/graphics/GeometryHandle.java
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
* @author Michael Zangl
*/
public class GeometryHandle extends GLBufferHandle {
private int vao;
public int vao;
private EGeometryFormatType format;

public GeometryHandle(GLDrawContext dc, int vbo, int vao, EGeometryFormatType format) {