86d8ee4c38
Merge pull request #1496 from rasmusgo/fix-spelling
...
Fix spelling
2022-03-04 16:28:32 +01:00
061ef44def
Merge pull request #1499 from rasmusgo/dev-better-goto
...
Better goto
2022-02-28 22:16:37 +01:00
fa5e229015
Fixed forward declaration of enums
2022-02-26 19:44:49 +01:00
8533be8d5c
Replaced MakeUnique and MakeUniqueArray with std::make_unique
2022-02-26 18:48:51 +01:00
89551c83cf
Merge branch 'dev' into dev-graphics-overhaul
...
# Conflicts:
# src/graphics/engine/text.cpp
# src/graphics/engine/text.h
# src/script/scriptfunc.cpp
2022-02-26 04:43:56 +01:00
3001927576
Removed engine.h from includes in header files, replaced by forward declarations and includes in source files
2022-02-26 03:53:39 +01:00
baa616050a
Some refactors to reduce extensive recompilation cascades
...
Renamed AlphaMode::OPAQUE to AlphaMode::NONE due to clash with preprocessor define
Moved Gfx::EngineTriangle to a separate file
2022-02-26 02:39:13 +01:00
e839f0dec7
Extended Material structure with PBR material attributes and added some of them to object renderer
...
Moved PBR lighting calculations to a separate shader source file
Removed some unused stuff
2022-02-26 01:16:36 +01:00
3168bf4350
Small cleanup
2022-02-25 21:07:01 +01:00
6447304531
Added nlohmann-json library to dependencies
2022-02-25 20:41:45 +01:00
6aebf60300
Merge pull request #1487 from pestoffne/fix/editor-input-utf8
...
Fixed input of long UTF-8 symbols in editor (#1423 )
2022-02-25 17:09:27 +01:00
0829cd84fe
goto: Remove unused BEAM_ACCURACY
2022-02-17 23:58:32 +01:00
8af600692e
goto: Reduce NB_ITER back to 200
2022-02-17 23:40:07 +01:00
3478ee322b
goto: Find a more exact end of path wrt goalRadius
...
The last segment of the path is shortened to avoid going too close
and risk bumping into the object that it was meant to approach.
The same position could also be found by finding the roots of a second
order polynomial analytically but this solution is simple and sufficient.
2022-02-15 22:46:30 +01:00
550d0f915b
Use std::out_of_range in Utf8CharSizeAt
2022-02-14 18:33:41 +07:00
d9e26c2516
Use std::invalid_argument in Utf8CharSizeAt
2022-02-14 18:23:44 +07:00
4bce63e38d
Use 0b instead of 0x and check 1-byte prefix first in Utf8CharSizeAt
...
1-byte symbols is more common then 4-bytes symbols.
So checking 1-byte prefix first is more efficient.
2022-02-14 18:09:08 +07:00
ec8a09e4a9
Merge commit '3405c03' into fix/editor-input-utf8
2022-02-14 17:57:30 +07:00
05b68a4b80
Refactor: Create function isUtf8ContinuationByte
2022-02-14 17:56:34 +07:00
c378009128
Feature-breaking refactors
...
* Partially filled Material structure, currently only base attributes
* Removed recoloring of textures and team variants
* Removed one base object tier in engine structures
* Removed EngineRenderState
* Rewritten some code to better coding style
2022-02-13 00:03:46 +01:00
2d794d1a32
goto: Handle oversized costs with a special bucket
...
This is a bit redundant because the current usage of goto
does not trigger it. It can be triggered by:
* increasing goalRadius
* decreasing NUMQUEUEBUCKETS
* decreasing BM_DIM_STEP
* increasing edge costs
2022-02-12 23:35:58 +01:00
e38835cfd4
goto with A-star (with bucket queue)
2022-02-12 23:35:58 +01:00
2b8d580355
goto with Dial's algo (Dijkstra's + bucket sort)
2022-02-08 21:14:17 +01:00
ee390bc270
LoadFinishedLevels if needed in LoadScene
2022-02-08 20:02:56 +01:00
14e7cd0e52
Rename loadgame to loadsave
2022-02-08 14:17:11 +01:00
6d8a52eb15
Merge pull request #1458 from lolbot-iichan/produce_teams
...
Add optional team parameter to produce() function
2022-02-07 16:34:19 +01:00
951db17d53
Merge pull request #1488 from colobot/dev-refactor-fonts-cache
...
Refactor fonts reloading
2022-02-07 15:24:10 +01:00
0d612b9928
Optimized text rendering
2022-02-05 21:07:25 +01:00
aacc2d0596
Moved non-CRenderer-specific functionality back to CDevice and refactored some of the state change methods
...
Rewritten control rendering code to use improved way of sending geometry to GPU memory
2022-02-05 19:07:46 +01:00
074706e7ec
Removed Vertex and VertexCol structures
2022-02-04 01:22:27 +01:00
1631b9587f
Removed all DrawPrimitive*() methods from CDevice
2022-02-04 01:06:37 +01:00
750a470b9a
Minor color refactors, added DrawPrimitives, rewritten remaining effect rendering
2022-02-04 01:00:18 +01:00
37bdc8665f
Removed remaining rendering code from CGL33Device and fixed some issues
2022-02-03 20:53:53 +01:00
d16144eee4
Added missing include and removed debugging calls
2022-02-03 18:55:46 +01:00
1a190b7f6f
Partial refactor of UI rendering to improve performance and fix transparency issues
...
Disabled rendering via CDevice
2022-02-03 18:40:58 +01:00
a7b294025e
Rename BeamSearch to PathFindingSearch etc
2022-02-02 20:26:05 +01:00
e2d4dd6995
Use ray tracing algorithm in BitmapTestLine
2022-02-02 20:26:05 +01:00
d9f3078396
Replace beam search with breadth-first search
2022-02-02 20:26:05 +01:00
0908e10ff6
Removed material, lighting, fog and shadowing code from CDevice
2022-02-02 19:09:38 +01:00
7d9badb542
Added UV transform and rewritten animated texture mapping code to use it
2022-02-02 18:13:21 +01:00
3bd4fee844
Merge branch 'dev' into dev-graphics-overhaul
...
# Conflicts:
# src/graphics/engine/camera.cpp
# src/object/auto/autonuclearplant.cpp
# src/object/auto/autopowerplant.cpp
# src/object/interface/powered_object.h
# src/object/motion/motionvehicle.cpp
# src/object/old_object.cpp
# src/object/old_object.h
# src/object/task/taskmanip.cpp
# src/object/task/taskmanip.h
# src/object/task/tasktake.cpp
2022-02-02 18:11:06 +01:00
3405c038c9
Merge pull request #1495 from rasmusgo/numpad
...
Add workaround for numpad home/end keys etc
2022-02-02 16:45:14 +01:00
3400a0fab0
Add -loadgame argument to load game on start
2022-02-02 11:01:57 +01:00
eff8e885d5
Fix assert fail after PR#1444
2022-01-30 20:40:04 +01:00
0003494c9e
Merge PR #1444
2022-01-29 17:16:57 +01:00
741d5c75ba
Refactored shadow framebuffer creation and binding
2022-01-24 23:16:22 +01:00
2ff722eee6
Refactored or removed some of the unused CDevice features
2022-01-24 22:29:39 +01:00
39b6621463
Renamed transparency to ghost mode
2022-01-24 21:57:56 +01:00
9a07c1d858
Refactored background, cloud and planet rendering, fixed shadow settings
2022-01-24 21:50:45 +01:00
19ae57c9ad
Fix spelling of appearance
2022-01-24 19:56:47 +01:00
6e0207ca5e
Fix spelling in app and main
2022-01-24 19:47:07 +01:00
be8d37241a
Add workaround for numpad home/end keys etc
2022-01-23 13:16:13 +01:00
e76c00c7f4
Fixed the Z coordinate not working in particle renderer
2022-01-22 01:50:10 +01:00
cba70fc912
Added DrawPrimitive() to CObjectRenderer and used it for rendering water
2022-01-22 00:57:00 +01:00
048393f448
Added CParticleRenderer and reimplemented particle rendering code to use it
2022-01-20 21:38:58 +01:00
710f448477
Partially fixed rendering of models in front of the interface (e.g. profile screen)
2022-01-19 23:14:03 +01:00
367dab9c5a
Cleanup in vertex structures
2022-01-19 22:22:59 +01:00
c280924c0e
Removed Gfx::VertexTex2
2022-01-19 21:33:53 +01:00
5dacb82b22
Partial refactor of model I/O
...
* Mostly removed legacy Gfx::Material usage
* Bake legacy diffuse color to vertex color
* Removed code that writes to old model formats
2022-01-19 19:46:39 +01:00
a54a59146d
Corrected transparency mode
2022-01-19 17:14:27 +01:00
a1ea633a3e
Refactored EngineTextureMapping into enum class
2022-01-18 20:14:07 +01:00
68a222e03a
Refactored EngineShadowType to enum class
2022-01-18 19:42:19 +01:00
67bd982969
Refactored EngineTriangleType into enum class
2022-01-18 19:29:36 +01:00
754684bfe9
Refactored MatrixVectorMultiply(), added TransformDivide() for cases where perspective divide is needed
2022-01-05 19:22:57 +01:00
9c37f6cbd5
Fully refactored Math::Matrix, removed matrix.h and moved remaining functions to other files
2022-01-05 19:12:35 +01:00
208f142cd2
Made Math::Matrix an alias to glm::mat4, partial refactors
2022-01-05 00:35:41 +01:00
e5d8e2b428
Fixed compilation error
2022-01-04 21:45:10 +01:00
0bba168f94
Removed vector.h, refactored redundant functions and moved remaining ones to func.h
2022-01-04 20:43:36 +01:00
db3b1d74d1
Refactored unnecessary Normalize, DotProduct, CrossProduct and Clamp functions
2022-01-04 02:10:36 +01:00
50fe905455
Removed Math::Vector alias and refactored remaining uses of it
2022-01-04 01:39:55 +01:00
d5e8cfd4ba
Refactored Math::Vector to glm::vec3 in object task classes
2022-01-04 01:18:46 +01:00
ffe1815ec9
Refactored Math::Vector to glm::vec3 in object motion classes
2022-01-04 01:05:24 +01:00
2690d04f64
Refactored Math::Vector to glm::vec3 in object interface and object subclass classes
2022-01-04 00:52:07 +01:00
3707daf678
Refactored Math::Vector in object implementations
2022-01-04 00:16:59 +01:00
076dce6981
Refactored Math::Vector in CScriptFunctions
2022-01-04 00:11:20 +01:00
d6d74f200b
Refactored Math::Vector in convert_model tool
2022-01-04 00:03:57 +01:00
1a7ffa693b
Refactored Math::Vector in remaining UI classes
2022-01-04 00:01:54 +01:00
dbe127569b
Refactored Math::Vector in control classes
2022-01-03 23:55:50 +01:00
da2471567d
Refactored Math::Vector in sound implementation
2022-01-03 23:53:22 +01:00
55f5d25c95
Refactored Math::Vector to glm::vec3 in remaining auto classes
2022-01-03 23:48:38 +01:00
4634564f17
Refactored Math::Vector to glm::vec3 in various auto classes
2022-01-03 23:32:30 +01:00
300a2d8569
Refactored Math::Vector to glm::vec3 in CrashSphere, CObjectFactory, old_object.h, old_object_interface.h
2022-01-03 22:51:36 +01:00
b4bfb8b242
Refactored Math::Vector in CLevelParserParam, CObjectCondition and CScoreboard
2021-12-29 02:19:22 +01:00
6277e10b3f
Refactored Math::Vector in CParticle, CPlanet, CPyro, CTerrain, CText, CWater, ModelInput and few structures
2021-12-29 01:55:48 +01:00
47ad390f1d
Refactored Math::Vector in CCamera, CLightManager, CLightning, CMainMovie, glutil.h and geometry.h
2021-12-29 00:08:02 +01:00
d25d6124a9
Changed Math::Vector into alias to glm::vec3
2021-12-28 23:01:30 +01:00
70151279f6
Removed Math::Point and minor refactor
2021-12-24 20:44:54 +01:00
431416d75e
Refactored Math::Point in CEngine
2021-12-24 20:25:38 +01:00
77c6f8e54f
Refactored Math::Point in CRobotMain, CObjectFactory, CBaseBuilding, CAutoInfo, CScript, CDebugMenu, CDisplayText and CObjectInterface
2021-12-24 20:08:04 +01:00
dc99e19ed9
Refactored Math::Point in CPhysics, CDisplayInfo, CFileDialog, CMainDialog, CMainMap, CMainShort and CStudio
2021-12-24 19:02:25 +01:00
c659e060c1
Refactored Math::Point in task classes
2021-12-24 18:39:45 +01:00
f8f3a64612
Refactored Math::Point in motion classes
2021-12-24 18:32:42 +01:00
7bf37a3999
Refactored Math::Point in screen classes
2021-12-24 03:53:36 +01:00
3fabdad1fe
Refactored Math::Point in CSettings, CParticle, CPyro, CInterface, CMainUserInterface and CScreen
2021-12-24 03:45:59 +01:00
a806bb2657
Refactored Math::Point in auto classes
2021-12-24 03:26:25 +01:00
91c19bff55
Refactored Math::Point in control classes
2021-12-24 03:18:10 +01:00
9691974b1a
Refactored Math::Point in CLighting, CParticle, CParticleGenerator and CText
2021-12-24 02:36:54 +01:00
07d3d79e8d
Refactored Math::Point in CPlanet, CTerrain, CWater and CLevelParserParam
2021-12-24 02:04:15 +01:00
498f15cc92
Refactored Math::Point in CApplication, CInput, CCamera, CCloud and Event
2021-12-24 01:38:54 +01:00
b36ec266f0
Refactored Math::Point from vertex types
2021-12-24 00:57:04 +01:00
c0d067d24b
Changed Math::Point into alias to glm::vec2, minor refactors
2021-12-24 00:11:12 +01:00
12c0f41477
Removed unused null renderer files
...
Null renderer will be rewritten entirely anyway, no need to keep these files in their current form.
2021-12-23 23:40:34 +01:00
f7c66741c6
Removed Math::IntPoint
2021-12-23 23:38:26 +01:00
60deb0328a
Refactored Math::IntPoint in CInput and CImage
2021-12-23 23:36:30 +01:00
0ef4579da8
Refactored Math::IntPoint in CApplication and various classes
2021-12-23 23:26:08 +01:00
55c692e8bb
Refactored Math::IntPoint in CEngine and CParticle
2021-12-23 23:08:56 +01:00
835f84584e
Refactored Math::IntPoint in CTerrain
2021-12-23 22:47:44 +01:00
bd2ad39f6a
Refactored Math::IntPoint in CText
2021-12-23 22:47:15 +01:00
48d2b4a618
Refactored Math::IntPoint in core graphics classes
2021-12-23 22:35:28 +01:00
cd6ea1a4c5
Changed Math::IntPoint into alias to glm::ivec2
2021-12-23 22:09:58 +01:00
4ecfb47f07
Fix MSVC errors
2021-12-21 18:01:42 +01:00
d3dd99c384
Refactor fonts reloading
...
* Remove hardcoded default font name.
This means the `fonts/fonts.ini` file is now mandatory
and must contain definition of all 9 font types.
Old mods relying on an incomplete `fonts.ini` file might break.
A separate PR creating the required `fonts/fonts.ini` file
should be merged before this pull request.
* Simplify `CFontLoader`.
* Return `std::optional` instead of returning a default.
* Remove the now unnecessary `std::map`s.
* Remove the now unnecessary `GetFontType` method.
* Improve Gfx::FontType.
* Provide `ToString` function for the enum, which is now
used for logs and by `CFontLoader`.
* Provide `ToBoldFontType` and `ToItalicFontType` functions.
* Replace hex literals with binary literals for readability.
* Move font caching related code to a new private class `FontsCache`.
* Add neccessary changes because of changes made in `CFontLoader`.
* Add minor code improvements like renames and formatting.
* Split the code into smaller functions for readability.
* Simplify the `CText` class.
* Apply the rule of 5 to the `CachedFont` structure.
2021-12-21 00:50:36 +01:00
69ea470a26
CEdit::MoveChar never moves cursor between bytes of one UTF-8 symbol
2021-12-17 00:54:44 +07:00
65da4c42c4
CEdit::DeleteOne expands selection to delete integer number of UTF-8 symbols
2021-12-17 00:54:38 +07:00
cd059bd511
Show questions instead of crushing in case of UTF-8 errors
2021-12-17 00:54:30 +07:00
98ad26da3d
Changed glm::identity to explicit construction
2021-12-15 00:20:56 +01:00
36ac6d9956
Another fix
2021-12-15 00:09:47 +01:00
1eb17b2fa1
Added includes to fix compilation errors for older versions of glm
2021-12-14 23:56:24 +01:00
d651b36eb2
Corrected includes
2021-12-14 23:09:20 +01:00
7e0db31cc1
Merge branch 'dev' into dev-graphics-overhaul
2021-12-14 22:27:43 +01:00
c389156499
Added commands for controling triplanar mapping
2021-12-14 21:58:23 +01:00
0207669d61
Added optional triplanar mapping mode for the secondary texture
2021-12-14 21:54:19 +01:00
b158318e83
Possibly a fix for most transparency issues
2021-12-14 21:51:29 +01:00
11bfcc6d53
Fix resetting bound textures
2021-12-14 21:50:26 +01:00
9269a55e8b
Fixed input of long UTF-8 symbols in editor ( #1423 )
2021-12-14 23:06:37 +07:00
2583f6fe36
Removed UIRenderer's DrawPrimitive() via CDevice
2021-12-12 21:17:39 +01:00
193d105a3f
Refactor CBotUT.TestSaveStateIoFunctions
...
Split the test into several parametrised tests for each data type.
Add more tests with different values.
Fix the ReadBinary() function in order to fix the ReadDouble() function
for negative values (the sign bit was being lost).
2021-12-09 20:44:31 +01:00
9fd935770a
Fix CBotUT.TestSaveStateIOFunctions
...
Fail occurred due to wrong read of min double.
`unsigned long` has been changed in Write/ReadDouble functions to
`uint64_t`.
`unsigned int` has been changed in Write/ReadFloat functions to
`uint32_t`.
According to the standard
`int` is at least 16-bit so it might be too small for 32-bit `float`,
`long` is at least 32-bit so it might be too small for 64-bit `double`,
and `long long` is at least 64-bit.
2021-12-05 16:51:51 +01:00
d1489a1fb1
Removed ShadeModel
2021-12-05 13:01:12 +01:00
0568fcdb81
Refactored FillMode to enum class
2021-12-05 12:53:31 +01:00
39c837d323
Refactored PrimitiveType to enum class
2021-12-05 12:26:34 +01:00
7a555e19c4
Fix in convert_model tool
2021-12-04 16:04:53 +01:00
ae179d9005
Merge pull request #1440 from melex750/dev-insect-from-egg
...
Fix saving/loading programs for insects from AlienEgg
2021-12-04 10:04:49 +01:00
96fece4e6d
Merge pull request #1464 from nipsufn/master
...
fix SatCom content offset on screens with high resolution / small font size
2021-12-04 10:01:53 +01:00
9139239f9f
Merge branch 'dev' into dev-graphics-overhaul
...
# Conflicts:
# src/app/app.cpp
# src/graphics/opengl/gl14device.cpp
# src/graphics/opengl/gl14device.h
# src/graphics/opengl/gl21device.cpp
# src/graphics/opengl/gl21device.h
2021-12-01 17:27:54 +01:00
57502d2f54
Added object renderer (WIP)
...
Rewritten shadow rendering logic
Split some shaders into smaller parts
Shadow renderer now has its own framebuffer object
2021-12-01 17:05:20 +01:00
ce71f25901
Removed unused shader files
2021-10-25 21:42:19 +02:00
fea6b87139
Added fog to terrain renderer and renamed variables
2021-10-17 16:27:29 +02:00
4157604458
Added shadow renderer and removed rendering modes
2021-10-17 16:05:20 +02:00
117c72ba72
fix SatCom content offset on high resolution / small font size
2021-09-29 15:26:19 +02:00
79d4cd9060
Updated TerrainRenderer
...
* Engine will now use it to render terrain
* Added directional light source
* Added dynamic shadows
* Moved visibility computation to CEngine
* Removed uniform buffers
2021-09-19 20:08:31 +02:00
80f074e2ba
Update license headers
2021-09-11 15:53:59 +02:00
c9dca4cebd
Rename SystemDialogType::ERROR to ERROR_MSG
...
Unfortunately, the ERROR name collides with
a preprocessor definition in windows.h
2021-09-11 13:40:22 +02:00
a69b88e09a
Move time related functions out of CSystemUtils
...
GetCurrentTimeStamp() has not been moved because of
CApplication unit tests.
2021-09-11 13:26:38 +02:00
5daaba6e64
Fixes after merge
...
Fix mistakes after previous merge and make it compile.
Rewrite the function interpolating between time stamps as it was
written after the original pull request was created. Add unit tests
for it.
I couldn't help myself and also changed some enums to enum classes and
did some renames.
2021-09-11 12:44:26 +02:00
2b107736e2
Merge branch 'platform-independent' of https://github.com/AbigailBuccaneer/colobot into AbigailBuccaneer-platform-independent
2021-09-11 10:47:39 +02:00
30d688c1ec
Added and implemented terrain renderer
2021-09-05 16:32:19 +02:00
58c75ce61a
Added implicit conversion between Math::Matrix and glm::mat4
2021-09-05 16:32:18 +02:00
100be95113
Added CVertexBuffer and reimplemented vertex buffer management
2021-09-05 16:32:18 +02:00
5c037837f5
Added Vertex3D
2021-09-05 16:32:17 +02:00
tomangelo