 Kalle Bladin
|
aaa099d542
|
Solve conflict and fixed old code that did not run on OSX due to use of depricated shader functionality.
|
2016-04-18 23:05:19 -04:00 |
|
|
Kalle Bladin
|
ada97704f8
|
Solve compilation problems for OSX.
|
2016-04-18 22:44:20 -04:00 |
|
|
Erik Broberg
|
4f873e3f97
|
Resolved merge conflicts
|
2016-04-18 20:36:01 -04:00 |
|
|
Erik Broberg
|
4073f4e6cb
|
Merged in branch develop to feature/globebrowsing
|
2016-04-18 20:02:42 -04:00 |
|
|
Kalle Bladin
|
63f8405c0a
|
Solve merge conflict.
|
2016-04-18 19:55:01 -04:00 |
|
|
Kalle Bladin
|
0c33e2a2b6
|
Calculating uv coordinates to be used for sampling from tiled textures.
|
2016-04-18 19:52:01 -04:00 |
|
|
Erik Broberg
|
5cc2e5b9e6
|
Added class TwmsTtileProvider for testing only. Downloading tiles not working yet
|
2016-04-18 19:30:13 -04:00 |
|
|
Alexander Bock
|
906470f28e
|
Untabify the rest of the source files
Update Ghoul repository
|
2016-04-18 20:14:29 +02:00 |
|
|
Alexander Bock
|
a21c9538b6
|
Untabify more files
|
2016-04-18 15:15:30 +02:00 |
|
|
Alexander Bock
|
c8da825098
|
Rename ImageSequencer2 to ImageSequencer
|
2016-04-18 15:14:59 +02:00 |
|
|
Erik Broberg
|
269e6d61ed
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-04-15 18:05:21 -04:00 |
|
|
Erik Broberg
|
fafe4819e2
|
Added templated class LRUCache for Least-Recently-Used Caching
|
2016-04-15 18:05:11 -04:00 |
|
|
Kalle Bladin
|
6758f79d91
|
Solve merge conflict.
|
2016-04-15 17:22:59 -04:00 |
|
|
Kalle Bladin
|
7cdf991e76
|
Add use of textures to clipmap rendering.
|
2016-04-15 17:19:35 -04:00 |
|
|
Kalle Bladin
|
89d7b3ca8b
|
Reading textures that are used for patch rendering.
|
2016-04-15 17:17:31 -04:00 |
|
|
Erik Broberg
|
527f83aacd
|
Solved merge conflict
|
2016-04-15 15:52:09 -04:00 |
|
|
Erik Broberg
|
7ecae3003c
|
View frustrum culling done directly in chunk node tree update traversal
|
2016-04-15 15:39:55 -04:00 |
|
|
Kalle Bladin
|
0f88b922f7
|
Define interface for TextureTileSet.
|
2016-04-15 10:38:40 -04:00 |
|
|
Kalle Bladin
|
56f9db60bc
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-04-14 20:27:58 -04:00 |
|
|
Kalle Bladin
|
4fd0b0643c
|
Clearified latlon interface.
|
2016-04-14 20:27:43 -04:00 |
|
|
Erik Broberg
|
db6246e7c8
|
Added ChunkIndex to keep track of indices during tree traversal
|
2016-04-14 20:08:15 -04:00 |
|
|
Kalle Bladin
|
acf4297491
|
Changed definition of ordering in LatLon
|
2016-04-14 19:35:24 -04:00 |
|
|
Kalle Bladin
|
9a31b11639
|
Added classes TextureTile and TextureTileSet.
|
2016-04-14 19:29:58 -04:00 |
|
|
Erik Broberg
|
3ec7badcf0
|
Camera: added convenience method for getting viewRotation and added inner class SyncData
|
2016-04-14 17:33:52 -04:00 |
|
|
Erik Broberg
|
840a982e6d
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-04-14 12:48:11 -04:00 |
|
|
Erik Broberg
|
299cd27f2c
|
Fixed bug Camera (view rot matrix had translation components) and structured Camera code
|
2016-04-14 12:47:12 -04:00 |
|
|
Alexander Bock
|
6b5681626b
|
Removing clang-analyze warnings
|
2016-04-13 11:46:07 -04:00 |
|
|
kbladin
|
eeaa4925ba
|
Clean up in the geometry classes.
|
2016-04-13 10:23:42 -04:00 |
|
|
kbladin
|
23b28f9024
|
Solved merge conflict.
|
2016-04-12 22:37:20 -04:00 |
|
|
kbladin
|
12d2dc23fb
|
Clipmap prototype working.
|
2016-04-12 21:27:17 -04:00 |
|
|
Erik Broberg
|
baf8fa32ef
|
Added class FrustrumCuller for CPU testing points wrt view frustrum
|
2016-04-12 20:33:08 -04:00 |
|
|
kbladin
|
05569611da
|
Created clipmap geometry
|
2016-04-12 13:44:28 -04:00 |
|
|
Erik Broberg
|
3c8956ac96
|
ChunkNode do not inherti from Renderable
|
2016-04-12 12:00:22 -04:00 |
|
|
Emil Axelsson
|
48bd41ad9f
|
merge in changes from develop
|
2016-04-12 16:29:35 +02:00 |
|
|
Erik Broberg
|
0784fe22f8
|
Using log2 for calculating desired split level, but have to fake earth radius in ChunkLodGlobe
|
2016-04-11 20:52:08 -04:00 |
|
|
kbladin
|
48109dd664
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-04-11 17:35:00 -04:00 |
|
|
kbladin
|
21eab66080
|
Add new class ClipMapGeometry.
|
2016-04-11 17:34:50 -04:00 |
|
|
Erik Broberg
|
459633c0d3
|
Removed unused converter class
|
2016-04-11 17:17:43 -04:00 |
|
|
Erik Broberg
|
7dfcd7abcb
|
Refactored RenderableLatLonPatch to a simple base class PatchRenderer
|
2016-04-11 16:57:47 -04:00 |
|
|
kbladin
|
7592edf024
|
Solve merge conflict and removed unused code.
|
2016-04-11 13:41:06 -04:00 |
|
|
kbladin
|
552bdc1786
|
Remove NURBS interpolation in favor of global lat-lon maping in shader due to mis match in UV coordinates.
|
2016-04-11 12:09:45 -04:00 |
|
|
Erik Broberg
|
2e0e7a5bcc
|
Refactoring. Cleaning up Latitude and Longitude representation and logic
|
2016-04-11 12:04:20 -04:00 |
|
|
Alexander Bock
|
e4f8f8c830
|
Clang compile fixes
|
2016-04-11 11:18:50 -04:00 |
|
|
Emil Axelsson
|
4ff0205eae
|
bring in support for multiresolution volume rendering
|
2016-04-11 16:56:44 +02:00 |
|
|
kbladin
|
4e0fc13035
|
Two patches to imitate clipmaps. Apparently the UV coordinates are not mapped correctly on the sphere patches which is a big problem.
|
2016-04-08 16:06:06 -04:00 |
|
|
kbladin
|
cb9cce717c
|
Cleaned up code in latlonpatch.
|
2016-04-08 12:33:51 -04:00 |
|
|
Erik Broberg
|
61883afd2f
|
Sending dummy UVs from simple_vs to simple_fs to avoid shader crash
|
2016-04-08 10:38:18 -04:00 |
|
|
Alexander Bock
|
3de5fb3b55
|
Add FloatProperty to RenderableStars to modify transparency (closing #150)
|
2016-04-08 15:11:46 +02:00 |
|
|
Alexander Bock
|
72ccfe51e9
|
Ignore empty lines in Speck file reading (closing #133)
|
2016-04-08 15:06:13 +02:00 |
|
|
Alexander Bock
|
8f4d3c20eb
|
Untabify RenderableStars
|
2016-04-08 15:00:43 +02:00 |
|