a96a34575c
Fix initial message queueing by introducing a sleeping timer
2015-05-13 00:17:46 +02:00
b5846cc69b
Initiate thread sleeping after each initial message to not spam clients
2015-05-12 22:41:53 +02:00
072b9d7bef
Fix a crash that appeared with strcpy -> strcpy_s change
2015-05-12 22:22:31 +02:00
aa7830fed5
Added error when Label projection directory does not exist
2015-05-12 13:50:13 +02:00
b5aa86873a
Fix many warnings
2015-05-12 13:05:35 +02:00
cf857fc0f2
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-05-11 18:41:25 -04:00
1cebc07939
Modified projections, removed fading and some key binds
2015-05-11 18:39:35 -04:00
c345774a0d
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-05-11 23:30:12 +02:00
5027b32f9d
Add RenderableCrawlingLine for REX instrument on New Horizons
2015-05-11 23:29:27 +02:00
28f84eaab1
Removed printout..
2015-05-11 16:12:14 -04:00
70e50706c8
Merge branch 'develop' into trailmods
2015-05-11 15:28:31 -04:00
d6eaa0a81c
Added renderablePath with timestamps
...
Considered for using with 15 minute and hour timestamps
Added Shaders for the path
Included reparenting of the paths in renderengine
Modified start time for presentation
Changed model exaggeration to 1000 times original size
2015-05-11 14:41:27 -04:00
1177e4e4cf
Restructure parsers, send label parser information to GUI application
2015-05-07 18:26:23 +02:00
dac1f213b5
Fix instrumenttimes in labelparser
2015-05-07 17:42:37 +02:00
b536c5c32f
Merge branch 'develop' into feature/parser
2015-05-07 17:27:28 +02:00
e0fedb203d
Merge branch 'develop' into NewHorizonsMerge
2015-05-05 20:33:52 -04:00
665d832454
optimization for projections
2015-05-05 20:19:19 -04:00
e1c87a49ed
Redesign parser
2015-05-05 21:43:46 +02:00
02eaf6e7b9
Replaced asserts with ghoul_asserts
2015-05-05 17:57:18 +02:00
23a3950215
Fixing issue with linux
2015-05-05 17:46:51 +02:00
b35edde94a
Fixing issue with linux
2015-05-05 17:40:01 +02:00
dfca315293
Fixing issue with linux
2015-05-05 17:29:12 +02:00
b458e6c0f9
Yet another linux fix
2015-05-05 17:12:24 +02:00
335571879d
Fixing bug in linux with va_arg macros
2015-05-05 15:56:10 +02:00
b79acb1501
Fixing variable names to fix linux compile error
2015-05-05 15:45:00 +02:00
47af7a5270
Disabling the GUI applications on default, added possibility to enable them with a switch
...
Added additional check into the model loader to guard against empty models
2015-05-05 14:37:24 +02:00
74a15338ff
Merge branch 'feature/timelinegui' into develop
2015-05-05 14:22:56 +02:00
5b1ab8b692
Fix crash when changing coordinate system origin to Pluto
2015-05-05 14:10:37 +02:00
0c655e98f2
Merge remote-tracking branch 'origin/NewHorizonsMerge' into feature/timelinegui
...
Conflicts:
src/rendering/renderengine.cpp
src/util/imagesequencer2.cpp
2015-05-05 11:42:49 +02:00
f6d382f9f9
Merge branch 'NewHorizonsMerge' of openspace.itn.liu.se:/openspace into NewHorizonsMerge
...
Conflicts:
src/rendering/renderengine.cpp
2015-05-04 20:27:52 -04:00
0a1c0164ef
Fixes to trails, fov and adding some keybindings
2015-05-04 20:15:34 -04:00
f8d6f42f44
Default startup + renderengine fixes
...
Added interesting times for Dawn and Rosetta in default startup script.
Fixed coordinate system switch to Vesta, commented for demo but needed for
development.
2015-05-04 19:52:56 -04:00
17064a92d5
Modifying labelparser and imagesequencer2
...
For extension to handling other instruments than lorri
2015-05-04 19:40:08 -04:00
d495778d4a
Restored some changes lost in merge + "timedots"
...
Added impact on trails from start/stoptime definitions in modfile.
Added dots of equal time in trails, no progress on printing the time
string.
2015-05-04 19:30:57 -04:00
a993dfb42f
Storing frame-to-body relationship
...
Store frames for bodies in SpiceManager, still adding "IAU_" if
no frame is added for the body. Adding frames in renderableModel for
67p to get proper inertial frame.
2015-05-04 19:20:14 -04:00
fde0d10199
Fix error with instrument transmission over the network
2015-05-04 18:31:17 +02:00
314ce645f6
Fix a bug where OpenSpace would crash when too many field of views are generated
2015-05-04 11:55:53 +02:00
9a76f37573
Fix crashes with focus node change when view and camera vectors were almost the same but not equal
...
Fix crash when moving to time without any images
2015-05-03 00:14:01 +02:00
4f8c1e4a14
Added methods to Hongkang parser that publish the results
...
More changes to the TImeline GUI
2015-05-02 22:24:03 +02:00
6f6b1b9f2c
Start work on making a port to Mac OS
2015-04-28 02:01:44 +02:00
632025c2a0
Miinor bugfix, get position of body instead of frame
2015-04-24 17:55:48 -04:00
d3bf8eb7f7
Merge branch 'timeadjustments' into NewHorizonsMerge
...
Conflicts:
CMakeLists.txt
include/openspace/rendering/model/modelgeometry.h
include/openspace/rendering/model/wavefrontgeometry.h
include/openspace/rendering/planets/renderableplanetprojection.h
include/openspace/util/imagesequencer.h
scripts/default_startup.lua
src/abuffer/abuffer.cpp
src/rendering/model/renderablemodel.cpp
src/rendering/model/wavefrontgeometry.cpp
src/rendering/planets/renderableplanet.cpp
src/rendering/planets/renderableplanetprojection.cpp
src/rendering/renderablefov.cpp
src/rendering/renderabletrail.cpp
src/rendering/renderengine.cpp
src/scene/scene.cpp
src/scene/spiceephemeris.cpp
src/util/imagesequencer.cpp
2015-04-23 22:51:55 -04:00
59ab268489
restore back some previous code
2015-04-23 00:13:11 -04:00
2ad3b58898
Imagesequencer update:
...
- label/image data works
- fixed issues with instrument firing
- read handled in more uniform way
- adding ALICE scanner
- distance fading in renderabletrail (WIP)
- essential fixes to renderableFOV
- and additional changes to other classes reliant on imagesequenser.
2015-04-22 22:01:50 -04:00
7b9fc28f33
Merge branch 'timeadjustments' of openspace.itn.liu.se:/openspace into timeadjustments
2015-04-22 21:54:05 -04:00
8becbbde41
Imagesequencer update:
...
- label/image data works
- fixed issues with instrument firing
- read handled in more uniform way
- adding ALICE scanner
- distance fading in renderabletrail (WIP)
- essential fixes to renderableFOV
- and additional changes to other classes reliant on imagesequenser.
2015-04-22 21:53:28 -04:00
9226dd2d6b
Setting show errors to false by default in Spicemanager
...
Removed debugging printouts
2015-04-22 21:43:54 -04:00
7913c74760
Changed shader for RenderablePlaneProjection
2015-04-22 18:36:09 -04:00
bc591b2bdb
Made night texture only be loaded if one exists, added new shader for planets with a night texture.
...
Also added plane & image plane shader programs to the general shader declaration in scene.cpp
2015-04-22 15:41:55 -04:00
19417d87c8
Moved networking functions into their own engine class
2015-04-22 18:22:19 +02:00
Alexander Bock