dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	bin/baseset/no_sound.obs
#	bin/baseset/orig_dos.obg
#	bin/baseset/orig_dos.obs
#	bin/baseset/orig_dos_de.obg
#	bin/baseset/orig_win.obg
#	bin/baseset/orig_win.obm
#	bin/baseset/orig_win.obs
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.cpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/common.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/saveload/saveload.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
This commit is contained in:
Jonathan G Rennison
2019-01-29 02:28:14 +00:00
parent 37adf9be4a 310fa1af88
commit 281d346fe2
101 changed files with 8211 additions and 1612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/linkgraph/linkgraph_gui.cpp
View File

@@ -239,13 +239,16 @@ inline bool LinkGraphOverlay::IsLinkVisible(Point pta, Point ptb, const DrawPixe
const int top = dpi->top - padding;
const int bottom = dpi->top + dpi->height + padding;
// Cut-down Cohen–Sutherland algorithm
/*
* This method is an implementation of the Cohen-Sutherland line-clipping algorithm.
* See: https://en.wikipedia.org/wiki/Cohen%E2%80%93Sutherland_algorithm
*/
const unsigned char INSIDE = 0; // 0000
const unsigned char LEFT = 1; // 0001
const unsigned char RIGHT = 2; // 0010
const unsigned char BOTTOM = 4; // 0100
const unsigned char TOP = 8; // 1000
const uint8 INSIDE = 0; // 0000
const uint8 LEFT = 1; // 0001
const uint8 RIGHT = 2; // 0010
const uint8 BOTTOM = 4; // 0100
const uint8 TOP = 8; // 1000
int x0 = pta.x;
int y0 = pta.y;
@@ -253,7 +256,7 @@ inline bool LinkGraphOverlay::IsLinkVisible(Point pta, Point ptb, const DrawPixe
int y1 = ptb.y;
auto out_code = [&](int x, int y) -> unsigned char {
unsigned char out = INSIDE;
uint8 out = INSIDE;
if (x < left) {
out |= LEFT;
} else if (x > right) {
@@ -267,8 +270,8 @@ inline bool LinkGraphOverlay::IsLinkVisible(Point pta, Point ptb, const DrawPixe
return out;
};
unsigned char c0 = out_code(x0, y0);
unsigned char c1 = out_code(x1, y1);
uint8 c0 = out_code(x0, y0);
uint8 c1 = out_code(x1, y1);
while (true) {
if (c0 == 0 || c1 == 0) return true;