Sven Eberhardt
ebda8193ef
Replace NULL by nullptr in C++ sources
...
We don't support pre-C++0x any more, so nullptr should be fine everywhere (except in the plain C source files)
2016-11-02 19:58:02 -04:00
Julius Michaelis
376ca5a9df
Prevent using USE_CONSOLE in lib{misc,c4script}
2016-10-22 17:42:23 +02:00
Julius Michaelis
34a9a1de8d
Twiddle with header organization: lib{misc,c4script} do no longer include GL/glew.h
...
(Yes, it is just that complicated.)
2016-10-20 18:46:32 +02:00
Sven Eberhardt
9e150f2bfb
Viewport zoom towards center and fix scrolling
2016-10-08 19:15:26 -04:00
Sven Eberhardt
6ac3bde3de
Fix possible crash in viewport drawing
2016-08-30 18:56:27 -04:00
Lukas Werling
b7359e0c27
Remove the GTK platform (USE_GTK)
...
The GTK code does not work with the Qt editor. The simpler SDL2 platform
does, so we have little reason to keep the GTK code.
Note that GTK is still a dependency for mape.
Discussion: http://forum.openclonk.org/topic_show.pl?tid=3328
2016-08-03 16:25:46 +02:00
Sven Eberhardt
a7aa89f168
Merge branch 'master' into qteditor
...
Conflicts:
planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c
src/platform/C4WindowSDL.cpp
src/script/C4AulParse.cpp
src/script/C4Effect.cpp
2016-06-20 22:27:03 -04:00
Sven Eberhardt
881534bee0
Qt Editor: Shape properties
2016-04-25 16:17:10 -04:00
Lukas Werling
c349254d8b
Remove C4Particles.h include from C4Object.h
...
This reduces the number of files indirectly including PCG from ~50 to 7.
2016-04-25 21:24:27 +02:00
Nicolas Hake
9dddf289db
Merge branch 'master' into qteditor
2016-04-03 21:06:32 +02:00
Nicolas Hake
eabca223f5
Update all copyright notices for 2016
2016-04-03 20:24:42 +02:00
Nicolas Hake
493c276126
Rewrite header inclusions to #include "path/to/file.h" style
2016-04-03 20:24:42 +02:00
Nicolas Hake
0537df5f23
C4Object: Move C4Def.h dep out of header
...
C4Def is only ever used as a pointer inside C4Object.h, so we don't need
to include C4Def.h from it.
2016-04-03 13:24:26 +02:00
Nicolas Hake
735f9cc06b
C4Landscape: Pull everything private out of the header
...
Since LTCG is enabled now, we don't have to define every function inside
the headers for ~xXx super speed xXx~, which means we can strip the
headers down to their bare minimum and reduce interdependencies and
therefore recompilation times by a lot.
2016-04-03 13:24:24 +02:00
Lukas Werling
eefa8749a8
Fix viewport Zoom getting set to NaN
2016-03-22 16:49:39 +01:00
Lukas Werling
75f62e52f2
Make Qt editor work with the SDL engine
...
Viewport rendering doesn't quite work yet, though.
2016-03-20 21:16:52 +01:00
Sven Eberhardt
4f70fdbfc8
Qt Editor landscape drawing fixes and improvements. Add brush size preview.
2016-03-18 00:26:14 -04:00
David Dormagen
91391c64af
draw global particles on plane 900
...
Previously, global particles would be drawn even in front of Plane 1000+ (GUI) objects. Additionally, it was impossible to specify particles that were supposed to always be in front of all other particles (e.g. fog, clouds, emulated FoW, ...).
Now, you can attach particles to an object on plane 901+ and have them be in front of everything else.
2016-02-09 20:43:23 +01:00
Günther Brammer
11bbeb2a5b
Rename WITH_DEVELOPER_MODE to USE_GTK
...
This mirrors USE_WIN32_WINDOWS, USE_SDL_MAINLOOP and USE_COCOA.
2016-01-23 20:36:33 +01:00
Sven Eberhardt
148073a956
Fix black NO_OWNER viewport in network mode.
2016-01-16 16:29:23 -05:00
Sven Eberhardt
4eddeba9aa
Fix crash when drawing zero-sized viewports (may happen during editor viewport initialization)
2016-01-15 08:53:00 -05:00
Sven Eberhardt
c569036d1d
Make NO_OWNER viewports black in fullscreen+non-debug for non-observers #1557
2016-01-10 09:50:21 -05:00
Nicolas Hake
ddd068c830
C4Viewport: Turn some owned pointers into std::unique_ptr
2015-12-28 21:45:14 +01:00
Nicolas Hake
3590dda85a
C4Viewport: Merge ctor/Default, dtor/Clear
2015-12-28 21:43:03 +01:00
Nicolas Hake
d737dc1b05
Remove C4Video, StdVideo
...
Video recording and playback only worked on Windows, and recording only
handled video, not game audio. As such, it was of fairly limited use,
and there's lots of software available these days that handle both.
2015-12-28 11:43:41 +01:00
David Dormagen
dcfb986e34
moved sounds into subfolders
...
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
2015-12-13 22:14:55 +01:00
David Dormagen
fa10a214b5
replaced two missing sounds
...
..which were easy to find due to the new missing-sound-warning. Hah!
We have cool wind now.
2015-12-10 19:36:54 +01:00
Sven Eberhardt
cc12230d56
Add "immediate" parameter to SetPlrView and ResetCursorView script functions to force viewport scroll position to the target.
2015-12-02 22:11:28 -05:00
Sven Eberhardt
3fdf7142b5
Fix custom viewport zoom initialization done in InitilizePlayer in fullscreen mode.
2015-12-02 21:24:57 -05:00
Nicolas Hake
24b54211c5
Drop Min, Max, Swap for std::min, std::max, std::swap
...
The C++ standard library comes with perfectly fine implementations of
these functions, so there's no point in reimplementing them just for the
hell of it.
2015-11-15 13:53:01 +01:00
Sven Eberhardt
2a31fe72f8
Initialize new player viewports with proper zoom and zoom limits ( #1419 ).
2015-10-10 21:47:09 -04:00
Armin Burgmeier
20eb0615ee
Custom shader for drawing sky
...
Add a C4ShaderCall parameter to tho most important drawing functions, and
make C4DrawGL's CreateSpriteShader public with additional parameters to
specify additional defines and shader slices. C4Sky uses this to compile its
own shader with OC_SKY defined.
2015-09-12 18:15:34 -04:00
David Dormagen
ac738735b2
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
src/game/C4Game.cpp
src/game/C4GraphicsSystem.cpp
src/gamescript/C4GameScript.cpp
2015-09-02 08:19:34 +02:00
Sven Eberhardt
6ab6a1ac3c
Add script interface for some EFX sound modifiers.
2015-08-27 21:44:23 -04:00
David Dormagen
f05345375c
fixed wrong offset in scripted GUIs when upper-board is active
2015-08-02 23:19:28 +02:00
David Dormagen
196f528201
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/FancyGridMenu.ocd/DefCore.txt
planet/Objects.ocd/HUD.ocd/GridMenu.ocd/DefCore.txt
planet/Objects.ocd/Helpers.ocd/Dummy.ocd/Graphics.png
planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c
planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Flag.ocd/Marker.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
src/game/C4Game.cpp
src/gamescript/C4GameScript.cpp
src/gui/C4GameMessage.cpp
src/landscape/C4Landscape.cpp
2015-06-03 22:32:36 +02:00
Nicolas Hake
5562b09dc4
Remove a lot of disabled legacy code, round 2
...
Maybe at some point we'll be rid of all the commented-out code that
nobody has looked at in years.
2015-03-25 20:02:53 +01:00
David Dormagen
d07893dadc
fixed player names, clonk names and selector info being zoomed ( #687 )
2015-03-22 09:58:43 +01:00
Nicolas Hake
e21a5bdd44
Rename BoundBy to Clamp
...
"BoundBy" sounds like a predicate. "Clamp" is a common function name for
the operation in graphics processing, so it should be familiar to users.
2015-02-12 23:05:55 +01:00
Sven Eberhardt
c714e5e3b2
Fix full map screenshots ( #1220 ).
...
Fixed upperboard, borders when screenshotting while at the side of the map and issues when multiple viewports were open.
2015-02-03 01:00:16 +01:00
David Dormagen
bd04722553
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
src/game/C4GraphicsSystem.cpp
src/game/C4GraphicsSystem.h
src/game/C4Viewport.cpp
src/gui/C4GameMessage.cpp
2015-01-15 19:57:01 +01:00
Armin Burgmeier
f2830311a6
Fix crash on scenario section change ( #1221 )
2015-01-14 12:03:05 -05:00
Armin Burgmeier
a5c2e762f7
Fix memory leak when a viewport is re-initialized
2015-01-13 07:48:43 -05:00
Armin Burgmeier
57878a0604
Fix crash when viewing record with more than 2 players ( #1228 )
2015-01-12 16:37:51 -05:00
Armin Burgmeier
e1d1d540c7
Allow independent viewport and light regions in C4FoWRegion ( #1211 )
...
With this change, an additional rectangle is stored in C4FoWRegion that
represents the area covered by the viewport in fractional floating point
coordinates. This allows the light texture to be created for an arbitrary
portion of the landscape, and the coordinate transformations for the
shaders will still work.
Also, since the additional rectangle uses floating point precision, the
computed coordinate transformations do now give the exact same result as for
the landscape pixel-by-pixel, and there should not be any offsets left.
I also hope that this change improves or fixes the single-pixel-lines of sky
that are sometimes seen at the edges of the viewport.
2015-01-07 19:44:31 +01:00
Tobias Zwick
5e188aafb3
Fix setting small ViewOffsets. Refactor neighbouring code, enable a slight MouseAutoScroll by default
...
* make ViewX,ViewY,ViewOffsetX and Y private, add getters and setters that update variables that are dependent on these
2015-01-03 22:53:02 +01:00
Tobias Zwick
f5ecd4776d
new function SetLightRange (replaces SetPlrViewRange)
2015-01-02 01:06:00 +01:00
Armin Burgmeier
ae505e3c6b
Render FoW only if active for player
...
This allows to enable or disable FoW individually for each player with
SetFoW().
2014-12-29 23:08:17 +01:00
Armin Burgmeier
a3049207c9
Use full ambient lighting in global viewports
...
This allows to see the whole landscape without any areas covered by FoW
in the global viewport. Basically the ambient lighting is set to 1.0
independent of the ambient light map. In the course of this, a second
shader for the landscape has been introduced.
2014-12-28 15:07:42 +01:00
Armin Burgmeier
c687ea4040
C4Viewport: Fix memory leak of C4FoWRegion object
2014-12-28 14:07:50 +01:00