mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,677 Commits 99 Branches 46 Tags
83f463ddd4e2fdaaec991dbe7e54247ac69e08ea
Commit Graph

312 Commits

Author SHA1 Message Date
Emil Axelsson
4cdae984e9 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-09-11 11:52:31 +02:00
Alexander Bock
c3825cc81e Only display commit hash text overlay if there is information available 
Add version and commit information into a global property
 2017-08-31 11:37:22 -04:00
Alexander Bock
0ceab49df7 Update gitignore to include Mars texture 
Update SGCT reference
Update Ghoul reference
Prevent spherical grid to recreate grid each frame
Add version and commit information (closes #395)
 2017-08-30 14:56:02 -04:00
Alexander Bock
09a94e6bf5 Workaround for Visual Studio 15.3 compile fix in Windows headers 2017-08-18 15:44:06 -04:00
Emil Axelsson
75fccbefcd Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	modules/globebrowsing/globebrowsingmodule.cpp
 2017-08-18 13:26:50 +02:00
Alexander Bock
621dd20f45 Fix include of default applications 2017-08-16 15:08:47 -04:00
Emil Axelsson
2426545a05 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/sceneloader.cpp
	tests/test_concurrentjobmanager.inl
	tests/test_concurrentqueue.inl
	tests/test_sceneloader.inl
 2017-08-15 11:43:18 +02:00
Alexander Bock
52b257a62c Support nested module directories (closing #369) 2017-08-14 16:11:36 -04:00
Alexander Bock
c275b2f833 Feature/cmake cleanup (#381) 
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
 2017-08-14 09:38:32 -04: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
02ce2a1b2a Merge pull request #375 from OpenSpace/feature/property-documentation 
Feature/property documentation

Adds documentation strings to properties
Fix all the errors that occurred during the change
Fix capitalization of property names
 2017-07-26 19:59:56 -04:00
Arfon Smith
4fc5bc5384 Fixing up YAML affiliations 2017-07-26 12:20:54 -04:00
Alexander Bock
dc79a94142 Remove warnings 
Update SGCT repository
Update Ghoul repository
 2017-07-26 11:59:48 -04:00
Alexander Bock
2cef26c1e3 Update paper.md 
Add indexed affiliations
Add references to the Summary text
 2017-07-25 12:12:05 -04: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
713b5bb97b Fix compile error in iSWA module 
Update warning specification for modules
Disable unreferenced local function warning
Update Ghoul
 2017-07-15 17:48:03 -04:00
Alexander Bock
93cb8a98da Set correct compiler flags for OpenSpaceTest 2017-07-15 16:12:49 -04:00
Alexander Bock
469140f4f0 C++17 nested namespace test 2017-07-15 15:37:42 -04:00
Klas Eskilson
98534bc1ec Normalize ALL the line endings (#361) 
* Normalize ALL the line endings

* Add Ghoul respository and openspace.cfg
 2017-07-13 12:08:47 -04:00
Alexander Bock
23a97e982b Remove the SIMD project and thus remove the dependency on NASM 2017-07-10 13:48:00 -04:00
Alexander Bock
0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00
Alexander Bock
90a937e127 Merge branch 'master' into feature/cpp17-update 2017-07-01 15:47:00 -04:00
Alexander Bock
8a781a2028 Compile fix for Windows 10 SDK 2017-07-01 15:26:39 -04:00
eriksunden
0d05d30396 Feature/packaging (#333) 
* Added proper CPACK structure and added generation of openspace.h header to add verisoning information in CMake.

* Packaging(ZIP on Windows, TGZ on UNIX) and installer creation(Windows Only via NSIS) is now working.

* Fixes for packing an archive on OSX.

* Add missing files in packaging
Add install setting to the globebrowsing module to copy required gdal_data
Update Credits

* Updated application icon
 2017-07-01 14:04:37 -04:00
Alexander Bock
e358d9d27c Update to C++17 2017-07-01 12:31:26 -04:00
Alexander Bock
109d6563b5 Remove tinythread in SGCT and replace with std::thread 2017-06-21 14:14:22 -04:00
Klas Eskilson
3b2ca27562 [Cmake] Rename use renamed ghl_copy_files macro 2017-06-02 09:47:51 -04:00
Alexander Bock
3fc310800e Adding paper for submission to the Journal of Open-Source Software 2017-06-01 12:04:55 -04:00
Alexander Bock
0ff91e896b Fix style guide check 
Fix style guide in files
 2017-04-24 15:31:32 -04:00
Alexander Bock
d7e1a21551 Define compile options as private for supressing warnings 2017-04-06 19:38:10 -04:00
Alexander Bock
a35609c6dd Add new libCurl that supports SSL for new GIBS datasets 
Update WMS specification of GIBS datasets
 2017-04-03 15:53:56 -04:00
Alexander Bock
dc40812df9 Fix warnings in code 
Make OpenSpaceTest not flood the console on Jenkins
Fix Vec3 property to signal change correctly
Let RenderablePlanetProject correctly reload base map and height map
Update Ghoul
 2017-03-11 11:26:25 -05: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
Alexander Bock
fbea8389c8 - Add check in style guide that prevents ‘using namespace’ in header files 
- Remove using namespace ghoul::opengl from Globebrowsing and adjust
 2017-03-01 21:02:33 -05:00
Alexander Bock
6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock
2ebc803cb7 Reduce dependency of onscreengui module in libOpenspace 
Add check to `check_style_guide` that reports wrong dependencies
 2017-02-16 16:54:03 -05:00
Alexander Bock
8456087cf5 Add a style check that checks whether the correct GLM header is used 
Adapted files to use the correct GLM headers
 2017-02-14 13:12:59 -05:00
Alexander Bock
70020e3de7 - Add style check for correct use of components and subcomponents in 
include guards
- Disallow use of lower case characters in include guards
- Fix wrong components and subcomponents
 2017-02-10 14:46:51 -05:00
Alexander Bock
23ea86949f Updated check_style_guide to test for include guards and copyright 
notices
 - Fix include guards
 - Fix copyright header indentation
 - Update copyright years
 2017-02-09 23:55:39 -05:00
Alexander Bock
9e4cf8196d Add script to check include guards 2017-02-09 18:23:33 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017 
Update Ghoul repository
Remove libgdal link
 2017-02-06 18:02:01 -05:00
Alexander Bock
0ad004bdc9 Add Python script to create new files 2016-12-18 23:28:11 +01:00
Alexander Bock
c390f6be30 Update copyright header 2016-12-14 21:36:28 +01:00
Alexander Bock
1d79fea969 Add potential for modules to be defines as shared libraries 2016-12-05 15:51:11 +01:00
Alexander Bock
c21bb3bb4d Make SGCT work between Debug and Release without manual removal 2016-10-31 15:24:46 +01:00