1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-30 10:15:36 +01:00
Commit Graph

50 Commits

Author SHA1 Message Date
Ted John
5f9d03e9df Refactor ImageId and use in more functions 2021-12-03 19:59:33 +01:00
Hielke Morsink
9dd20ec619 Improve array formatting
For most of these cases, adding a trailing comma to the array block makes clang-format put each item on a new line, and clang-format exception blocks could be reduced where clang-format does not handle them properly.
2021-10-17 18:21:45 +02:00
Michał Janiszewski
1b4875e528 Extract math-related functions from common.h to Math.hpp
Saves wide inclusion of <stdexcept> header, which pulls in <string>
2021-10-09 21:43:06 +02:00
IntelOrca
4f319d6ed4 Prepare footpath handling for surfaces and railings 2021-09-12 17:52:01 +02:00
Gymnasiast
4cc717ccdb Rework path surface and railings descriptor handling 2021-09-05 19:09:09 +02:00
Gymnasiast
2282f24404 Rename path surface and railings descriptors 2021-09-05 19:09:09 +02:00
ζeh Matt
01c808c601 Remove unused argument of wooden_(a|b)_supports_paint_setup 2021-08-26 20:54:06 +03:00
ZehMatt
0e08286d88 Apply review comments 2021-08-21 14:07:27 +03:00
ZehMatt
3d90257dde Simplify more argument passing to PaintAddImageAsParent 2021-08-20 23:34:44 +03:00
ZehMatt
7764bb910f Use CoordsXYZ instead of anonymous struct in unk_supports_desc 2021-08-20 23:34:44 +03:00
ZehMatt
7feea62ab3 Remove overload of PaintAddImageAsParent with bbox offset 2021-08-20 23:34:44 +03:00
ZehMatt
6c233ac802 Remove first overload of PaintAddImageAsParent 2021-08-20 23:34:44 +03:00
Duncan
35ba734669 Minor paint refactor (#14905)
Names a few unknown flags
2021-06-22 07:36:17 +01:00
Matt
a35d221afa Remove unnecessary construction of CoordsXYZ in Supports.cpp 2021-06-05 17:16:07 +03:00
Matt
1d3b56a59e Refactor uses of PaintAddImageAsParent in Supports.cpp 2021-06-05 17:16:06 +03:00
duncanspumpkin
6882ddaf12 Clang format the relevant files 2020-11-07 14:15:25 +00:00
duncanspumpkin
f6d2db48dc Name 98196C 2020-11-07 14:15:25 +00:00
duncanspumpkin
d6669be939 Rename main paint add image functions 2020-11-07 14:15:24 +00:00
X123M3-256
9681ea4cea Add "Hybrid Coaster" ride type (#12110)
* Add "Hybrid coaster" ride type

* Add turns

* Add diagonal slopes

* Add bank transitions

* Add diagonal bank transitions

* Add banked turns

* Add sloped turns

* Add sloped bank transitions

* Add sloped banked turns

* Add s bends

* Add helices

* Add barrel rolls

* Add half loops

* Start changing supports to wooden

* Switch diagonals and banked turns to wooden supports

* Finish switching supports to wooden

* Alter default supports for small turns and steep turns

* Split track sprites that were glitching

* Fix incorrect sprite indices on small helices

* Add supports for large flat to steep pieces

* Fix bug with b supports

* Add supports for quarter loops

* Finalize set of track elements

* Fix strange colors when track piece is highlighted

* Update sprites.json

* Add support for corkscrews

* Fix incorrect remap colors and default supports

* Add slope to banked turn transitions

* Add support for preview image in color selection window

* Fix static glitches

* Correct Z offset

* Set segment heights (and fix more static glitches)

* Improve sloped curve supports

* Fix slope to banked turn transitions

* Fix dynamic glitches

* Fix boosters

* Remove corkscrews

* Set ride data and implement ride rating function

* Fix glitches on steep turns and gentle to steep

* Format code

* Add sprites

* Add track color preview image

* Fix formatting

* Add files to MSVC project

* Fix Testpaint

* Revert removal of RIDE_TYPE_50 from GetClassification

* Introduce constant instead of hard coded number

* Fix stray change

* Improve legibility of ride_ratings_calculate_hybrid_coaster()

* Fix comments on byte_97B23C

* Fix two other stray changes

* Fix Xcode project

* Adjust bounding boxes to make clipping behaviour more consistent

* Fix two glitches on medium and large turns

* Address comments from DuncansPumpkin

* Fix incorrect ride ID

* Fix steep turn sprites

* Run PNG images through OptiPNG

* Update changelog

* Fix namespace error

* Use arrays for supports to handle additional elements

* Rename functions to TitleCase and add namespace

* Increment network version

Co-authored-by: Edward Calver <hx010973@reading.ac.uk>
Co-authored-by: tylerleamon <59478575+tylerleamon@users.noreply.github.com>
Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2020-10-10 20:27:12 +01:00
Aaron van Geffen
7b5087f057 Update copyright year to 2020 2020-07-21 15:04:34 +02:00
Michael Steenbeek
a261b4ce33 Remove commented out code (#11721) 2020-05-11 13:54:15 +02:00
Gymnasiast
923701e16b Clean up metal supports in Junior RC drawing 2020-05-04 14:59:29 +02:00
ifimfree
fb6dd4bfad Create constants for a few flags 2020-04-20 10:39:26 +02:00
Sijmen Schoon
3f3baa2b13 Revert changing constructor lists to constructors 2019-10-31 16:10:26 +01:00
Sijmen Schoon
ab2dbea32a Change a sizable portion of LocationXY(Z) to (Tile)CoordsXY(Z) 2019-10-31 00:19:14 +01:00
Filip Gawin
6833da77e3 Simplify boolean expresions 2019-05-10 22:00:38 +02:00
Aaron van Geffen
2af13904c5 Update copyright notices for 2019. (#8903) 2019-03-17 07:16:15 +00:00
Michael Steenbeek
4e9d2ce764 Split footpath object into two internally 2019-01-20 21:38:38 +01:00
Gymnasiast
d000457fb5 Rename more occurrences to railingEntry 2019-01-20 17:23:27 +01:00
Matt
468d94a6ca Remove gCurrentViewportFlags 2018-12-05 23:09:17 +01:00
ζeh Matt
3e457436b1 Refactor some painting code. (#8144) 2018-10-26 10:49:27 -07:00
clang-format
b02dfdbc93 Binpack function arguments together
Previously when the arguments of a function wouldn't fit on a single line, clang-format would put each argument on its own line instead. By enabling the binpack parameter setting, it tried to fit as many on one line as possible instead.

Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-23 16:00:22 +02:00
clang-format
191973b202 clang-format paint 2018-07-23 16:00:06 +02:00
Michael Steenbeek
1b08fb4e69 Replace our own integer types with standard ones 2018-06-20 17:30:40 +02:00
Hielke Morsink
0cf256ac9e Ready copyright notice for clang-format
Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier.

I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
2018-06-15 14:07:34 +02:00
Ted John
d1d9f0a86a Add debug drawing option for blocked tiles
Replace old unused original drawing code toggle options with new option to show which tiles are blocked by vehicles.
2018-06-10 22:59:58 +01:00
Ted John
92f6ac7333 Rename header files to match renamed source files 2018-06-01 09:38:30 +02:00
oli414
3bff12c081 Seperate surface tile element 2018-05-01 16:33:16 +02:00
Michał Janiszewski
32619f460b Remove remaining calls to get_current_rotation in paint code 2018-02-17 13:11:07 +01:00
Michał Janiszewski
5795810a85 Remove rotation argument from sub_98198C 2018-02-17 13:11:07 +01:00
Michał Janiszewski
3f92471ffb Remove rotation argument from sub_98197C 2018-02-17 13:11:07 +01:00
Michał Janiszewski
c420fb56f5 Remove rotation argument from sub_98196C 2018-02-17 13:11:07 +01:00
Hielke Morsink
55979a3fff Remove and replace C typedefs
`typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way.
This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
Aaron van Geffen
ead49fa84e Name Unk141E9DC as WaterHeight. 2018-02-05 00:20:12 +00:00
ZehMatt
84f2917f59 Use const and constexpr whenever possible. 2018-01-11 22:29:08 +01:00
Michał Janiszewski
5a8cfb16c8 Clang-format guards for static data
This guards most of the hardcoded data from clang-format.

[ci skip]
2018-01-11 09:19:56 +01:00
Ted John
f18595a1c1 Refactor viewport.c to C++ 2018-01-07 12:39:58 +01:00
Michał Janiszewski
b2bc974fe7 Use nullptr where possible 2018-01-04 06:58:44 +01:00
Hielke Morsink
eb4a8924d1 Refactor and clean up footpath-related code
This commit corrects some misused defines, and gave them clearer names.
For example, the slope mask was only useful for surface elements, so now
"SURFACE" is in its name. I also replaced any hard coded values that I
could find and knew their purpose off.
2018-01-03 10:57:37 +01:00
Michael Steenbeek
c4f44e5e7a Compile files in paint folder as C++ 2017-12-17 17:24:36 +01:00