Commit Graph

546 Commits (aa6345ab5e2a0303cf3349774889a710a6ba7258)

Author SHA1 Message Date
krzys-h effd349449 Fixed cutscene camera animation, closes #731 2016-03-15 21:09:21 +01:00
krzys-h 4479a196f9 Fix colobot-lint warnings 2016-03-15 17:39:00 +01:00
Tomasz Kapuściński 4c6f8239fa Renamed and moved GL33 shader files to separate directory 2016-03-14 21:44:25 +01:00
Tomasz Kapuściński cec942b4fd Renamed and moved GL21 shader files to separate directory 2016-03-14 21:24:27 +01:00
Tomasz Kapuściński 2774fcd8a2 Small changes in the GL21 shader 2016-03-14 20:02:31 +01:00
Tomasz Kapuściński 169aa63822 Potential fix for #726 2016-03-14 19:23:21 +01:00
krzys-h cbdda57288 Merge branch 'dev-right-click-camera' into dev 2016-03-13 14:52:17 +01:00
Tomasz Kapuściński 8deeddffe0 Corrected OpenGL 2.1 engine's error spam and added experimental terrain shadowing 2016-03-10 10:50:54 +01:00
Tomasz Kapuściński e6a2fc9671 Rewritten shadow mapping implementation 2016-03-07 18:33:19 +01:00
Tomasz Kapuściński 9effa308ce Small change in enabling/disabling shadow mapping 2016-03-06 20:25:50 +01:00
Tomasz Kapuściński d3ccdebd9f Added names to graphics devices 2016-03-06 19:32:37 +01:00
krzys-h f67d76fed4 Merge branch 'dev' into dev-right-click-camera 2016-03-05 21:09:00 +01:00
krzys-h 4e50f36214 Merge branch 'dev' into dev-right-click-camera 2016-03-02 20:00:57 +01:00
Tomasz Kapuściński 5fa3ed63b1 Compilation fix 2016-02-29 16:51:18 +01:00
Tomasz Kapuściński 78e877d9a8 Changes in framebuffer creation, framebuffer error detection and small other graphical things 2016-02-29 16:42:01 +01:00
Tomasz Kapuściński 0bb5f96d7a Changed depth of shadow map texture to 32 2016-02-28 23:17:25 +01:00
krzys-h b97070bbad stupid whitespace 2016-02-28 20:57:39 +01:00
krzys-h 282cd65a2d Fix reloading changed ground spot textures (closes #404) 2016-02-28 20:22:05 +01:00
krzys-h 643c40e778 Revert "Get rid of "blacklisting shadowXX.png" logs"
This disabled loading of those textures completly

This reverts commit 60f0a7b45c.

 #BlamePiotrdzAgain
2016-02-28 20:17:35 +01:00
Tomasz Kapuściński 14d6ee74a3 Removed dirt from water surface 2016-02-27 15:29:41 +01:00
krzys-h 9c32f705b6 FIXED ALL GOLD EDITION LIGHTING PROBLEMS!! Yay! 2016-02-21 15:35:52 +01:00
krzys-h 3de6794835 Allow both right and middle mouse button for camera movement 2016-02-19 17:27:55 +01:00
krzys-h 700f3ad448 Edge camera speed fix 2016-02-19 17:22:20 +01:00
krzys-h b15666f48e Restored old camera scroll as a config option 2016-02-19 17:14:08 +01:00
krzys-h 1efa4b132c Fixed mouse invert settings; removed camera scroll setting 2016-02-19 17:14:08 +01:00
krzys-h 47d39e5b22 Right click camera; minor CCamera cleanups 2016-02-19 17:14:08 +01:00
krzys-h d9ccd6edf3 Camera smoothness adjustment 2016-02-19 17:14:08 +01:00
Tomasz Kapuściński 739f90e38e Reverted changes to OpenGL version detection 2016-02-18 20:51:02 +01:00
krzys-h 0256b1aa39 Add logging in font loading 2016-02-18 18:07:29 +01:00
krzys-h 1b21c387bb Fixed colobot-lint warnings 2016-02-18 12:20:40 +01:00
Tomasz Kapuściński 0ad53cc0d8 Fix compilation error 2016-02-18 01:36:37 +01:00
Tomasz Kapuściński 0eaf3a9ac4 Added rendering modes and shaders to OpenGL 3.3 engine and fixed problem with detecting extensions in core profile 2016-02-18 00:57:37 +01:00
Tomasz Kapuściński 0154af39aa Corrected compilation problem (GL_MAX_FRAMEBUFFER_SAMPLES) 2016-02-15 20:59:09 +01:00
Tomasz Kapuściński 517d6f069a Reimplemented drawing primitives in OpenGL 3.3 engine 2016-02-15 20:31:32 +01:00
Tomasz Kapuściński 79c21f6676 Moved LightLocations to outside of UniformLocations 2016-02-15 20:05:25 +01:00
krzys-h 977607a934 Updated license headers 2016-02-13 14:11:30 +01:00
krzys-h 55412842df Fixed some code style warnings 2016-02-13 13:46:56 +01:00
Tomasz Kapuściński 6b7e6cbc75 Added rendering modes and implemented additional OpenGL 2.1 shaders 2016-02-13 03:54:49 +01:00
Tomasz Kapuściński bf8916b9eb Changes in detection of graphics hardware capabilities 2016-02-12 16:14:29 +01:00
Krzysztof Dermont c780148b77 Fix crash related to TTF and PHYSFS
TTF fonts will be loaded to memory instead of file pointers

Added new class CSDLMemoryWrapper that loads data from PHYSFS into memory block
and closes file after. This closes issues #519, #708 and #619
2016-02-11 16:12:16 +01:00
Tomasz Kapuściński b6faadca03 Rewritten OpenGL 2.1 engine's two-sided lighting 2016-02-11 15:04:07 +01:00
Tomasz Kapuściński 32b480b226 Rewritten lighting in OpenGL 2.1 engine 2016-02-10 23:38:49 +01:00
Tomasz Kapuściński 898001e065 Changed CGL33Device requirement to OpenGL 3.2 2016-02-10 22:50:40 +01:00
Tomasz Kapuściński 447b466d6e Optimizations in graphics engines 2016-02-10 21:40:41 +01:00
Tomasz Kapuściński a924cf6a75 Fix for fog distance 2016-01-31 00:38:24 +01:00
Tomasz Kapuściński 15c5e69199 Fix for visibility distance setting 2016-01-30 23:58:26 +01:00
Tomasz Kapuściński 12067c1b9f Optimized light updating in CGLDevice 2016-01-30 18:51:13 +01:00
Tomasz Kapuściński 9db943b820 Optimized matrix operations in CGLDevice 2016-01-30 17:41:11 +01:00
Tomasz Kapuściński 05e19f47c3 Corrected MSAA support detection 2016-01-29 12:02:36 +01:00
Tomasz Kapuściński 00221c9a3f Optimized DrawPrimitives() in CGL33Device 2015-12-24 00:21:57 +01:00
Tomasz Kapuściński d944a55905 Optimized DrawPrimitives() in CGL21Device 2015-12-24 00:06:58 +01:00
Tomasz Kapuściński f2a295348c Optimized DrawPrimitives() in CGLDevice 2015-12-23 23:49:00 +01:00
Tomasz Kapuściński d82b5ef746 Added DrawPrimitives() for drawing multiple primitives (not optimized for now) 2015-12-23 23:23:10 +01:00
Tomasz Kapuściński 22e963e2c4 Added information about graphics card to error message 2015-12-20 17:34:55 +01:00
Tomasz Kapuściński aa2e14219e Added warnings and error messages to graphics devices regarding unsupported OpenGL version 2015-12-18 21:04:16 +01:00
Piotr Dziwinski d11ebc891c Bring to zero some types of issues reported by colobot-lint 2015-10-04 00:09:10 +02:00
krzys-h 3815ef0bd6 Refactored CPauseManager (again) 2015-10-01 18:55:41 +02:00
krzys-h 58035f3cd1 Fixed rendering camera overlay color, closes #157 2015-09-30 21:41:00 +02:00
krzys-h 95f1e3f19a Fixed water/lava moving and waves (#659) 2015-09-30 20:31:09 +02:00
krzys-h 2f0ec3fe75 Fixed lava particle effects (#659) 2015-09-30 20:21:25 +02:00
Piotr Dziwinski 61a3ba2800 Fix undefined function colobot-lint issues 2015-09-29 21:44:24 +02:00
krzys-h 2cb2782c9d Restored old Ceebot-Teen objects
In preparations for new programming course
2015-09-28 22:08:59 +02:00
Piotr Dziwinski 66ce745be0 Introduce forward declarations as suggested by colobot-lint 2015-09-27 16:28:14 +02:00
krzys-h 6a6025f557 Implemented force feedback 2015-09-27 00:34:03 +02:00
krzys-h 07df35ca01 Refactored mouse wheel 2015-09-25 22:54:48 +02:00
krzys-h a0034f8000 Finalized SDL2 migration 2015-09-25 21:26:49 +02:00
krzys-h dfa06dafcf Refactored window resize 2015-09-25 11:11:35 +02:00
krzys-h 53e4470dbf Started SDL2 migration 2015-09-24 21:09:46 +02:00
krzys-h 389aaaf132 Fixed 'invui' disabling too much 2015-09-12 11:51:03 +02:00
krzys-h 2792fa2c6c Fixed mouse cursor scaling (again)
How could I even miss the fact that my previous fix is not working at all? :P
2015-09-11 17:54:55 +02:00
krzys-h b058a6986b Minor improvments to plane camera 2015-09-06 20:33:04 +02:00
krzys-h 582e3c865f Allow controlling plane camera with number keys 2015-09-06 20:15:56 +02:00
krzys-h f6fdec1479 Allow controlling free camera with arrows when no object is selected 2015-09-06 20:09:47 +02:00
krzys-h 5fd1735678 Added option to move camera lookat point in free cam 2015-09-05 20:59:11 +02:00
krzys-h fb03a497d7 Added command to hide the UI 2015-09-04 19:16:21 +02:00
krzys-h e956311626 Moved free camera controls to numpad; added 'camtype %d', 'camspeed %f', 'freecam' 2015-09-04 19:04:42 +02:00
Tomasz Kapuściński 658e2ff1be Possible fix for issue #520 2015-09-02 21:35:43 +02:00
krzys-h c3d7876a5c Made CPauseManager not a singleton 2015-08-31 22:05:21 +02:00
krzys-h ff17961584 Refactored CPauseManager 2015-08-31 21:47:55 +02:00
krzys-h 2ec5e07080 Possible fix to #608 2015-08-31 12:06:14 +02:00
Piotr Dziwinski 3335be42de Fix MSVC compilation
Forgot to push this the last time
2015-08-30 22:11:30 +02:00
krzys-h d4b431adaa Recalculate camera projection matrix after aspect ratio change 2015-08-25 16:18:01 +02:00
krzys-h 844e7343e0 Possible fix to #601 2015-08-24 23:19:02 +02:00
krzys-h 6ed83bb63f Fixed Shielder not being destructible by OrgaMatter even when the shield is not active, closes #597 2015-08-24 21:12:06 +02:00
krzys-h f78f4854b4 Fixed failing assertion when turning objects into ruins, closes #598 2015-08-24 20:22:08 +02:00
krzys-h b5bd1b2d74 Destroy static buffers after resolution change
Under windows, changing the video mode causes SDL to destroy and recreate the OpenGL context, which invalidates all current static buffers.
It works on Linux because the actual SDL implementation here differs.

See http://sdl.beuc.net/sdl.wiki/SDL_SetVideoMode for details:
> Also note that, in Windows, setting the video mode resets the current OpenGL context. You must execute again the OpenGL initialization code (set the clear color or the shade model, or reload textures, for example) after calling SDL_SetVideoMode. In Linux, however, it works fine, and the initialization code only needs to be executed after the first call to SDL_SetVideoMode (although there is no harm in executing the initialization code after each call to SDL_SetVideoMode, for example for a multiplatform application).
2015-08-24 19:43:06 +02:00
Piotr Dziwinski 60f0a7b45c Get rid of "blacklisting shadowXX.png" logs 2015-08-22 18:17:57 +02:00
Piotr Dziwinski b93f610930 Fix license header in all files 2015-08-22 16:40:02 +02:00
krzys-h 8421189716 Merge branch 'dev-cbot-syntax-highlighting' into dev (#575) 2015-08-18 23:01:02 +02:00
krzys-h e91ecbbb01 Removed unused references to effect03.png from the code 2015-08-18 22:59:31 +02:00
krzys-h 1c0fc21e2b Made all colors a bit darker 2015-08-18 22:12:00 +02:00
krzys-h c5da68d516 New CBot syntax highlighting 2015-08-18 22:12:00 +02:00
krzys-h 371621ced4 Render trace colors in the code instead of using texture 2015-08-18 22:11:04 +02:00
krzys-h a5c84b9a1e Removed unused OBJECT_FIX and OBJECT_FRET 2015-08-18 11:43:41 +02:00
Piotr Dziwinski a63a959dbe Apply clang-modernize -use-nullptr 2015-08-17 22:40:52 +02:00
Piotr Dziwinski ba3284b8b8 Apply clang-modernize -add-override 2015-08-17 22:12:09 +02:00
krzys-h 2dbacc28b5 Fixed too small AlienAnt damage 2015-08-17 22:05:26 +02:00
krzys-h 1185bd4c36 Fixed OrgaMatter destroying itself and the wasp 2015-08-17 19:12:58 +02:00
krzys-h 1059ae37c1 Shielder subclass 2015-08-17 14:06:31 +02:00
krzys-h 75de19f10e COldObjectInterface::SetViewFromHere -> CControllableObject::AdjustCamera 2015-08-17 11:53:34 +02:00