antar420
221db02af6
Refactoring modelgeometry and wavefrontgeometry
...
To make modelgeometry more ready for extension in reading other file
formats in subclasses. Some minor fixes including an out of bounds error
for texture mapping with several shapes in the same file.
2015-03-12 17:57:10 -04:00
antar420
4653d3d7c6
Minor fixes in renderablemodel
...
Added _performShading as a property and modified a spicemanager call to be able
to work with models with different names for the rotation source frame and
ephemeris body (such as 67p).
2015-03-10 12:22:52 -04:00
Alexander Bock
a4e4df3d28
More cleanup of WaveFrontGeometry and RenderableModel
2015-02-25 23:58:30 +01:00
Alexander Bock
bd382f9e8e
Cleanup of WaveFrontGeometry
2015-02-25 23:39:20 +01:00
Alexander Bock
5c72966346
Implemented caching for OBJ model files
2015-02-25 11:48:17 +01:00
Michal Marcinkowski
85e13f7738
Added:
...
New obj mod file with separate obj-loads
Imagesequencer - active instrument slightly improved
Printout of active instrument
Ortho-square dissapears when not needed
2015-02-24 00:03:00 -05:00
Alexander Bock
78ab23602f
Moved tinyobjloader from util into submodule of Ghoul
2015-02-23 18:08:28 +01:00
Michal Marcinkowski
cc65ce1167
changing obj loader to tinyobj
2015-02-22 13:10:47 -05: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 Marcinkowski
f032b4e3b0
Merge branch 'develop' into solarsystem2
...
Conflicts:
.gitignore
include/openspace/rendering/renderablefov.h
src/CMakeLists.txt
src/rendering/model/renderablemodel.cpp
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/rendering/renderabletrail.cpp
src/util/factorymanager.cpp
2014-12-15 13:23:30 -05:00
Jonas Strandstedt
da4fa44c03
Continued work on memory leaks and proper isReady usage
2014-12-11 16:48:49 +01:00
Michal Marcinkowski
bd841c488c
Merge branch 'develop' into solarsystem2
...
Conflicts:
.gitignore
src/rendering/renderablefov.cpp
src/rendering/renderablepath.cpp
src/scenegraph/scenegraph.cpp
src/util/factorymanager.cpp
2014-12-08 21:26:38 -05: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
Alexander Bock
4de8071efe
Force all Renderables to declare an 'isReady' function to circumvent assertion triggers when a crucial element of initialization fails
...
Fix velocity in RenderableStars
2014-11-28 01:41:26 +01:00
michal
d6d7f1ffe7
intermediate commit.
2014-11-12 12:28:16 -05:00
michal
d3ea503454
Fixes to the modelloader class
2014-10-23 20:11:49 -04:00
michal
ecfc4ad79a
reshaping the modelloader class to suit the overall design of openspace
2014-10-23 18:49:15 -04:00
