Malin Ejdbo
257d3f8538
Update model bounding sphere to account for parent scale, closes #1630
2021-06-04 10:16:48 +02:00
Malin Ejdbo
4202b21ebc
Merge branch 'master' into feature/jwst
...
* Resolve conflicts
2021-05-26 14:21:10 +02:00
Alexander Bock
63cbf270ee
Adapt to changes in codegen that require specifying the identifier in the codegen::doc function
2021-05-25 23:10:12 +02:00
Alexander Bock
cb17bd7570
Remove warnings
2021-05-25 22:06:49 +02:00
Alexander Bock
6cf6e450fb
Address MacOS compile issues, make ISS model scene graph node visible
2021-05-25 17:50:31 +02:00
Alexander Bock
92432caed2
Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string
2021-05-17 00:23:15 +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
Emma Broman
33a9dd2f09
Avoid problems with comment ending in backslash
2021-04-27 11:19:18 +02:00
Malin Ejdbo
2b74a04415
Adjust model bounding sphere
2021-04-21 11:04:42 +02:00
Malin Ejdbo
a541721d33
Address PR comments and tweak animation mode Once
2021-04-16 15:51:31 +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
e91d833c65
Optimize model rendering
...
* Don't render when too far away, same as RenderableGlobe
2021-03-31 14:19:27 +02:00
Malin Ejdbo
1596bbb813
Add possibility to give model scale as a number
2021-03-30 17:13:38 +02:00
Malin Ejdbo
2feff86181
Clean up
2021-03-29 11:37:23 +02:00
Malin Ejdbo
1bfa7bf5f5
Remove support to combine several geometries
...
* And make use of file verifier for the model file
2021-03-24 17:05:18 +01:00
Malin Ejdbo
2873cdb826
Use convertTime for time scale of animation
2021-03-24 12:06:34 +01: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
aa5394e88c
Add info message when an animation exists for a model
2021-03-23 18:02:06 +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
f1d66b1a74
Add animation mode bounce
2021-03-19 09:55:50 +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
205374fee2
Use codegen in ModelProjection and make use of new dictionary
2021-03-18 15:20:23 +01:00
Malin Ejdbo
c1fb7d39e7
Remove "" from codegen comments
2021-03-18 09:40:30 +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
aebe6c1217
Add codegen for renderablemodel
2021-03-12 09:55:23 +01:00
Malin Ejdbo
4fb8a36952
Merge branch 'master' into feature/multitexturing
...
* Resolve conflicts
2021-03-02 15:49:39 +01:00
Malin Ejdbo
4b6a61354d
Add deprecation warning when using several model files for one model
2021-02-17 10:03:54 +01:00
Alexander Bock
88122d1dbb
Adapt to new Ghoul; fix previously undetected errors in uniform setting
2021-02-11 14:44:13 +01:00
Malin Ejdbo
c3e96c2ec5
Further address OpenSpace PR comments
2021-02-09 17:46:52 +01:00
Malin Ejdbo
51f02dc738
Small fix and update ghoul
2021-02-08 13:32:38 +01:00
Malin Ejdbo
f65eaaba4d
Address OpenSpace PR comments
2021-02-05 14:14:13 +01:00
Malin Ejdbo
08e2c3fb41
Address Ghoul PR comments
2021-02-05 11:17:33 +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
Alexander Bock
7004c02b86
Happy new year
2021-01-02 15:26:51 +01:00
Alexander Bock
067c0f4b27
Introduction of new Dictionary class ( #1446 )
...
* Adapting to introduction of new Dictionary class in Ghoul
* Mainly replacing usage of float instead of doubles as expected
* Adjust to the lack of the hasKeyAndValue function
2021-01-02 15:07:11 +01:00
Malin Ejdbo
8aac7d6400
Adjust to the new structure when loading list of models
...
* Update Ghoul
2020-12-22 14:49:07 +01:00
Alexander Bock
60e3ed2170
General pass for coding style
2020-11-28 22:31:06 +01:00
Malin Ejdbo
fbc8e584d8
Add support for list of model files in asset files
...
* Load either one or several model files in asset files
* In the case of several model files, combine all models into one single ModelGeometry
2020-11-05 15:52:07 +01:00
Jonathas Costa
3fbefa5324
Feature/orion changes ( #1359 )
...
* Changed RenderableModel to allow user-control depth and blending.
* Updated RenderableModel to correctly handle the Orion Nebula model.
Co-authored-by: Alexander Bock <mail@alexanderbock.eu >
2020-11-04 13:11:25 +01:00
Jonathas Costa
db4f16f75f
Issue/1223 ( #1358 )
2020-11-04 12:59:42 +01:00
Malin Ejdbo
6eef29c423
Update Ghoul and add possiblity to force invivible meshes to render
...
* Update Ghoul
* Add setting in asset file to specify if invisible meshes should be
forced to render or not
* Change model shader to work with updated ghoul with embedded materials
and textures
* In shader, render forced invisible meshes with procedural pink and
green chessboard pattern
2020-10-26 11:16:56 +01:00
Alexander Bock
efffc25ce0
Feature/globals handling ( #1352 )
...
* Cleaner handling of global state
* Prevent Lua memory corruption (closes #982 )
* Initialize glfw first thing to prevent weird joystick loading bug during startup
2020-10-21 22:30:05 +02:00
Malin Ejdbo
6df1667583
Add multi model format support with Assimp
...
* Update submodule Ghoul to point to branch feature/multitexturing
* Remove old datastructure for ModelGeometry (moved to ghoul)
* Change RenderableModel to work with new ModelGeomtry structure in
ghoul
* Work in progress: Textures
2020-10-20 10:32:12 +02:00
Alexander Bock
89af15126b
Use global memory block for the models
2020-08-19 10:27:21 +02:00
Alexander Bock
7603edf906
Add the ability to add multiple ModelGeometry's for a RenderableModel to show models with multiple OBJ files without needing to create multiple scene graph nodes
2020-08-18 16:34:54 +02:00
