Alexander Bock
9366fd4b80
More clang fixes
2015-05-13 19:48:41 +02:00
Alexander Bock
3ba9cbdb96
Linux compile fix
2015-02-23 14:18:21 +01:00
Joakim Kilby
3d04af03a3
Merge branch 'develop' into plutoViz
...
Conflicts:
include/openspace/rendering/planets/simplespheregeometry.h
include/openspace/util/powerscaledsphere.h
openspace.cfg
shaders/pscstandard_fs.glsl
src/engine/openspaceengine.cpp
src/rendering/planets/renderableplanet.cpp
src/rendering/renderablefov.cpp
src/rendering/renderabletrail.cpp
src/rendering/renderengine.cpp
src/scenegraph/scenegraph.cpp
2015-02-18 15:52:35 +01:00
Alexander Bock
a6ebddb8eb
Updated copyright header in all files
2015-02-17 14:20:03 +01:00
michal
bd74acedd3
fixing stupid git mistake.
2014-11-28 17:15:13 -05:00
michal
a5c232eb88
Tidying up.
2014-11-28 14:41:59 -05:00
michal
845469b15d
Merge branch 'develop' into solarsystem2
...
Conflicts:
openspace.cfg
shaders/generated/constants.hglsl
src/engine/openspaceengine.cpp
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/rendering/renderabletrail.cpp
src/util/spicemanager.cpp
2014-11-26 13:42:36 -05:00
michal
5d1b0c694a
some cleanup.
2014-11-13 11:35:17 -05:00
Jonas Strandstedt
ed3063ab86
Continue fixing warnings
2014-10-24 11:18:36 +02:00
michal
3bb9912356
latest changes involve adding an unfinished class called "renderable fov"- ignore that one.
...
The rest is pretty straight forward, renderable trail is the ephemeris class and wavefrontobject is a very crudely constructed reader... ill fix that on monday
2014-10-11 01:43:31 -04:00
michal
1ed4b74d3e
added renderablepath and made changes to renderabletrail
2014-10-08 16:15:37 -04:00
michal
21745b91a5
new class - renderabletrail - will later be renamed and current replace renderableephemeris.
...
Right now just adding a bunch of mod files, i know this is rather ugly but i just need it to work for friday.
2014-10-07 18:44:14 -04:00
Alexander Bock
2bfbdbb905
Added copy constructor to PowercaledCoordinate class
2014-05-13 22:05:34 +02:00
Alexander Bock
3520bd121e
Renamed pss to PowerScaledScalar
2014-05-11 18:34:57 +02:00
Alexander Bock
37e5e63b70
Updated ghoul version; some code cleanup
2014-05-11 18:22:20 +02:00
Alexander Bock
9bc084bf81
More PowerscaledCoordinate cleanup
2014-05-11 15:59:48 +02:00
Alexander Bock
89142340d0
PowerscaledCoordinate cleanup
2014-05-11 15:01:55 +02:00
Alexander Bock
40a2cb1068
Renamed psc to powerscaledcoordinate and pss to powerscaledscalar
2014-05-11 14:32:42 +02:00
