Commit Graph

101 Commits

Author SHA1 Message Date
Alexander Bock
fc9b2ab091 Increase the compilation speed (#3545)
- Remove toStringConversion function and move json_helper include out of numericalproperty.inl
  - Optimizing some header files
  - Remove duplicate Lua functions from properties. 
  - Move List,Option,Selection,String, and TriggerProperty into misc folder
  - Move lua_helper include out of inline file
  - Add lua_helper to the precompiled header
  - Declare property functions as final. No longer have OptionProperty derive from IntProperty
  - Remove Dictionary header from properties
2025-03-14 11:22:40 +01:00
Alexander Bock
5152a7a6e0 General code spring cleaning (#3525) 2025-02-22 15:28:14 +01:00
Alexander Bock
096363fd06 Make constructors explicit 2025-02-05 23:22:32 +01:00
Alexander Bock
820e90eab4 Happy new year 2025-01-14 16:21:08 +01:00
Alexander Bock
6e29d898cf Update copyright header 2024-02-06 15:53:24 +01:00
Alexander Bock
3dadf9c5fa Only create RingComponents and ShadowComponents when they are actually needed 2023-12-01 09:35:38 +01:00
Malin E
54ad5bfdd5 Add pivot property for Models to move model origin 2023-08-09 16:04:20 +02:00
Malin E
6054a817d8 Move model loading code to initialiseGL, fixes #1838 2023-05-24 16:40:17 +02:00
Malin E
9081a4db66 Make the numeric value of the model scale a property in the gui 2023-05-22 17:46:31 +02:00
Malin E
0490e94350 Fix modelshader example in Debug mode 2023-05-22 11:37:28 +02:00
Malin E
6d8f7b2fbd Handle override RenderBins from asset files 2023-04-13 10:59:23 +02:00
Malin E
1d92383317 Make sure RenderBin is set before render function is called 2023-04-06 14:53:05 +02:00
Malin E
be2e9d5caf Address PR comments 2023-03-22 13:37:30 +01:00
Malin E
3cd2cfac93 Fix issue with side by side stereo rendering 2023-03-09 11:59:44 +01:00
Malin E
184a8b59ac Fix hole cutting or side by side stereo
* And disable face culling for Orion model that is a one sided plane
2023-03-08 11:49:55 +01:00
Malin E
98836e5393 Fix manual depth test hole cutting 2023-03-03 08:44:13 +01:00
Malin E
fedbf9a31e Remove unused textures 2023-03-02 15:31:10 +01:00
Malin E
06db9b3ce9 Add model scale and debug invisible feature to model projection 2023-02-23 11:05:44 +01:00
Malin E
f6eac4f0c7 Take back manual depth test for the two pass model rendering 2023-02-21 18:08:38 +01:00
Malin E
14edda9e61 Remove problematic manual depth test code 2023-02-01 16:25:19 +01:00
Malin E
f490fccee6 Merge branch 'master' into feature/model-opacity
* Solve conflicts in ghoul, renderablemodel.cpp and iss.asset
2023-02-01 14:52:33 +01:00
Alexander Bock
4f4764209f Happy new year 2023-01-02 11:19:33 +01:00
Malin E
560c58e499 Add manual depth test between models 2022-12-07 14:19:12 +01:00
Malin E
bf25e4562a Invert the disable properties culling and depth test in models
* disableFaceCulling -> enableFaceCulling

* disableDepthTest -> enableDepthTest
2022-11-25 10:01:46 +01:00
Malin E
04f0b1281a Remove EnableOpacityBlending property for models (unused) 2022-11-15 16:06:05 +01:00
Malin E
2cd09de2fa Fix support for transparent models 2022-11-14 10:27:20 +01:00
Malin E
6c223cd8ae Some clean up 2022-11-03 11:15:21 +01:00
Malin E
a77e227430 Re-use textures in the FramebufferRenderer for model opacity rendering 2022-10-28 10:12:56 +02:00
Malin E
eeebfdb2c6 Some small clean up 2022-10-06 13:48:16 +02:00
Malin E
4adaea5b76 Resize textures when window resizes 2022-10-06 12:04:22 +02:00
Malin E
202cf4b5b6 Fix opacity issue with model vs trails + small clean up 2022-10-06 11:41:15 +02:00
Malin E
3b5c3c51d6 Fix OpenGL error for model opacity shader program 2022-09-14 16:52:58 +02:00
Malin E
77beb4c3af WIP First attempt at a solution 2022-09-14 14:36:33 +02:00
Alexander Bock
9b1143f02f Ubuntu 22.04 and GCC11 fixes (#2163)
* Update CEF version
* Update Ghoul
* Update SGCT
* Update codegen
* Remove warnings happening on Ubuntu 22.04 with GCC 11
* AppleClang warning fixes
* Compile fix for Ubuntu and MacOS
* Add Qt 6.2.3 to the CMAKE_PREFIX_PATH
2022-06-28 00:46:01 +02:00
Alexander Bock
d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Alexander Bock
b649509bf0 Feature/model shader (#1723)
* Add support for RenderableModel to take custom shader code
 * Added example to highlight usage
2021-08-24 10:45:19 +02:00
Malin Ejdbo
4202b21ebc Merge branch 'master' into feature/jwst
* Resolve conflicts
2021-05-26 14:21:10 +02:00
Alexander Bock
6cf6e450fb Address MacOS compile issues, make ISS model scene graph node visible 2021-05-25 17:50:31 +02:00
Malin Ejdbo
16d38962c8 Add option to invert ModelScale
* Scale the JWST to correct size

* Add non standard units as option for ModelScale

* Add boolean option to invert the ModelScale of a RenderableModel

* Update JWST prism to correct size and matching rotation of JWST
2021-05-12 09:27:14 +02:00
Malin Ejdbo
4a97a21297 Address PR comments 2021-04-14 17:12:46 +02:00
Malin Ejdbo
3ec01fa25e Address PR comments 2021-04-07 17:25:58 +02:00
Malin Ejdbo
3a976ba0b0 Add model scale that can be set in asset file for each model
* Add cm and dm as units in DistanceUnits

* Scale the model according to the set unit
2021-03-24 10:47:40 +01:00
Malin Ejdbo
7ae3922132 Add BounceFromStart and BounceInfinitely animation modes 2021-03-23 13:42:05 +01:00
Malin Ejdbo
0a9af8f0ed Add error handling 2021-03-22 10:01:16 +01:00
Malin Ejdbo
fb4cb67ef6 Add property to enable/disable animation 2021-03-19 09:54:47 +01:00
Malin Ejdbo
4eb7c8abce Add animation mode to infinetly loop 2021-03-18 16:08:38 +01:00
Malin Ejdbo
3201be5cd6 Add loop from start mode for animation 2021-03-18 09:34:38 +01:00
Malin Ejdbo
323e9b2fb5 Update ghoul and add model animation 2021-03-16 09:05:32 +01:00
Malin Ejdbo
1502e75c43 Fix warning that texture1 cannot be found 2021-02-03 11:02:49 +01:00
Malin Ejdbo
73fd118ee2 Merge branch 'master' into feature/multitexturing
* Resolve conflicts
2021-02-01 11:57:31 +01:00