mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-01 17:20:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,480 Commits 99 Branches 46 Tags
ec7adfb71e089d350fbdf7adbaa41b2137292ce4
Commit Graph

61 Commits

Author SHA1 Message Date
ElonOlsson
ba0ec1808b finish merge and update with codegen 2021-05-27 09:18:32 -04:00
Alexander Bock
139d2c6c6d Apply more codegen checks (#1579) 
* Apply more codegen checks
 2021-05-08 00:44:23 +02:00
Malin Ejdbo
1267874a06 Update Ghoul and codegen 2021-04-21 10:39:19 +02:00
Malin Ejdbo
16bd1d3265 Merge branch 'master' into feature/model-animation 
* Resolve conflicts

* Master has error with changing focus
 2021-04-21 10:23:10 +02:00
Alexander Bock
d32a09ba80 Feature/strict lua (#1556) 
Make all LuaState strict to check whether uninitialized variables are used
Adapt the existing assets to work with the strict state
 2021-04-15 13:01:00 +02:00
Malin Ejdbo
3ec01fa25e Address PR comments 2021-04-07 17:25:58 +02:00
Alexander Bock
d9a1a0233b Remove apple clang warnings 2021-03-30 22:12:53 +02:00
Malin Ejdbo
c825916d60 Merge branch 'master' into feature/model-animation 
* Resolve conflicts
 2021-03-30 16:31:25 +02:00
Alexander Bock
e88650f22c Tiny coding style fixups 2021-03-27 23:49:02 +01:00
Malin Ejdbo
bc9fc63719 Merge branch 'master' into feature/model-animation 
* Resolve conflicts
 2021-03-25 13:54:51 +01:00
Malin Ejdbo
c253060b25 Merge branch 'master' into feature/model-animation 
* Resolve conflicts
 2021-03-18 08:33:43 +01:00
Alexander Bock
e2c1414ba6 Update to newest codegen, replace std::monostate with ghoul::Dictionary 2021-03-17 21:26:57 +01:00
Malin Ejdbo
b57c4e336c Merge branch 'master' into feature/model-animation 
* Resolve conflicts
 2021-03-17 13:19:04 +01:00
Alexander Bock
07389bd6bf Update codegen repository 2021-03-17 00:21:00 +01:00
Malin Ejdbo
aebe6c1217 Add codegen for renderablemodel 2021-03-12 09:55:23 +01:00
Alexander Bock
e7bcb774ee Add new verifiers for files and directories. Update codegen to be able to create these 2021-02-13 10:44:21 +01:00
Alexander Bock
afd484044d Better support for colors in dictionaries (closes #1489) 
- Add a new Color3Verifier and Color4Verifier that checks components to be in [0,1]
 - Update codegen to add a new attribute [[codegen::color()]] to mark a vec3/vec4 to be a color value
 - Update RenderableTrail to use the new verion
 2021-02-12 12:59:00 +01:00
Alexander Bock
6d821d4f91 Feature/codegen (#1480) 
* Add the ability to automatically generate code to extract values out of a Dictionary (see https://github.com/openspace/codegen for more information on how to use this)
* Applied this technique to a large number of cases in the codebase
* Don't add _codegen files to the repository

Co-authored-by: Emma Broman <emma.broman@liu.se>
 2021-02-09 09:12:43 +01:00
Alexander Bock
7004c02b86 Happy new year 2021-01-02 15:26:51 +01:00
Alexander Bock
43851899c7 Cleanup of more copyright headers 
Add debug groups and object names to the OpenGL objects in the framebuffer renderer
 2020-02-13 14:59:13 +01:00
Alexander Bock
de24e81bda Fix copyright header information 
Remove TimelineView application
 2020-02-12 22:36:11 +01:00
Alexander Bock
595cbc4bcf Feature/cleanup (#837) 
* Style guide fixes
* Various cleanups
* Update SGCT
 2019-05-03 13:27:43 +02:00
Alexander Bock
bb3db7ada7 Feature/jenkins fix (#816) 
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
 2019-03-24 11:19:39 +01:00
Alexander Bock
700fd60295 Update coding style to correctly ignore SGCT inline files in apps folder 
Update ghoul repository
 2018-10-17 08:30:55 +00:00
Alexander Bock
4952f8f977 Code cleanup branch (#618) 
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
 2018-06-10 04:47:34 +00:00
Alexander Bock
4041bbb935 Cleanup (#600) 
* General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings
 2018-04-19 13:27:15 -04:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
c9a3c68f19 Fix style guide issues 
Update Ghoul repository
 2017-12-29 19:18:06 +01:00
Emil Axelsson
fb675dfeab Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-04 10:52:12 +01:00
Alexander Bock
38338725b9 Strict coding style adherence 2017-11-26 14:57:26 -05:00
Alexander Bock
669078201a Add check for usage of ghoul_assert instead of plain old assert 
Update Ghoul
 2017-11-16 16:12:54 -05:00
Emil Axelsson
62c5506250 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-13 11:18:00 +01:00
Emil Axelsson
cb07af4a2b Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-10 16:07:58 +01:00
Alexander Bock
7e4bb0b2c6 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-09 22:49:07 -06:00
Alexander Bock
afa1d6d33e Add strict test for whitespace at end of line 
More work on coding style
 2017-11-09 23:47:51 -05:00
Alexander Bock
7b12a241ed Remove BOMs 
Fix coding style and script
 2017-11-09 19:10:32 -05:00
Alexander Bock
88cf7926ae Merge branch 'master' into feature/loadingscreen-refactor 
# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp
 2017-11-09 10:51:56 -05:00
Alexander Bock
ad3df78e1a Add strict coding style check for line length 2017-11-08 19:26:28 -06:00
Alexander Bock
acdfefe46d Merge branch 'master' into feature/loadingscreen-refactor 
# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h
 2017-11-08 19:10:59 -06:00
Alexander Bock
b50b52d351 Cleanup for coding style 
Add strict mode to check_style_guide script
 2017-11-08 10:35:39 -06:00
Alexander Bock
80f5706049 Remove warnings on Clang 2017-11-07 09:19:45 -06:00
Emil Axelsson
cb7319d5f2 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	data/scene/default.scene
	modules/sync/syncmodule.h
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/scene/scene.cpp
	src/scene/scene_doc.inl
	src/scene/scenegraphnode.cpp
	src/scene/scenegraphnode_doc.inl
	src/scene/sceneloader.cpp
	src/scripting/scriptengine.cpp
 2017-08-14 11:17:25 +02:00
Alexander Bock
e661324002 Remove style guide errors 
Add missing newline errors
 2017-07-21 11:52:25 -04:00
Emil Axelsson
84a52c091a Work on assets 2017-07-20 17:06:34 +02:00
Alexander Bock
631f53ed2d Append a check for UTF-8 BOM to the check_style_guide.py 
Add a script to remove a BOM
 2017-07-17 15:58:13 -04:00
Alexander Bock
0ff91e896b Fix style guide check 
Fix style guide in files
 2017-04-24 15:31:32 -04:00
Alexander Bock
522b3a7829 Update include finding script 2017-03-02 19:53:55 -05:00
Alexander Bock
fb67e805ac Various cleanup 
Add script that counts the number of includes
 2017-03-02 19:50:05 -05:00
Alexander Bock
2b07cf8c05 Add check for correct indenting of copyright header 2017-03-01 21:19:27 -05:00
Alexander Bock
3274882ec2 Add checks for inline files in style checker 2017-03-01 21:17:12 -05:00