Commit Graph

1814 Commits

Author SHA1 Message Date
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
cad83d0425 Added TwmsTileProvider tests 2016-04-18 19:30:57 -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
248014b6c2 Add Python script that converts tabs into spaces 2016-04-18 20:06:48 +02:00
Erik Broberg
90f7630eac Added simple test for LRUCache utilizing custum Key Classes and how to inject std::hash functor 2016-04-18 12:21:07 -04:00
Alexander Bock
6c6555bbce Print out the number of warnings, errors, and fatal errors that happened during initialization and each frame after
Updated to new Ghoul version
2016-04-18 16:44:44 +02:00
Alexander Bock
a59a1bd758 Turn off logging flush for increased performance 2016-04-18 15:15:42 +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
Alexander Bock
f0748505b7 Include VisualStudioOutputLog
Correctly allow '/' character in SceneGraph description files
2016-04-18 15:12:40 +02:00
Alexander Bock
f76d65cf19 Remove high-resolution Mars kernel and fall back to regular de430 kernel
Use correct PlutoProject path instead of previous PlutoProjectionHybrid
Updated Ghoul version
2016-04-18 15:11:13 +02:00
Alexander Bock
4936a4a084 Remove sgct.h inclusion from LuaConsole
Untabify more files
2016-04-18 11:12:12 +02:00
Alexander Bock
990f22bc6d Update the ghoul library 2016-04-18 09:23:19 +02:00
Alexander Bock
9c375db635 Updated Ghoul repository 2016-04-17 12:17:44 +01: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
Alexander Bock
7e44ac0621 Fixed Launcher to work with new possible module directory structure 2016-04-15 15:05:24 -04:00
Kalle Bladin
0f88b922f7 Define interface for TextureTileSet. 2016-04-15 10:38:40 -04:00
Alexander Bock
c73404a1de Rename PlutoProjectionHybrid module to PlutoProjection
Remove outdated PlutoProjection module
2016-04-15 10:37:24 -04:00
Alexander Bock
04af38f546 Enable subdirectories by specifying an intermediate directory in the scene file 2016-04-15 10:27:41 -04:00
Alexander Bock
588bc74a88 Enable subdirectories for modules
Move newhorizons scene modules into subdirectories
2016-04-15 09:52:08 -04:00
Alexander Bock
46b207b379 Removing some cppcheck warnings 2016-04-14 22:49:03 -04:00
Alexander Bock
b43a454e9f Fix GCC compiler warnings 2016-04-14 22:40:25 -04:00
Alexander Bock
ef2981f535 Enable global variables for module Lua scripts (closing #172)
Adapt New Horizons kernels to global switch between accurate and publicly avaiable kernels
2016-04-14 22:33:28 -04:00
Alexander Bock
dcf5507e1c Add the images of the plutoprojection into gitignore
Add a data directive to the plutoprojection that will download the New Horizons LORRI images
releases/v0.3.2
2016-04-14 21:17:19 -04:00
Alexander Bock
f5012d496d Compile fix for the SyncWidget in the Launcher 2016-04-14 21:16:25 -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
cf517f5309 Replacing CMake-based version setting with C++-based version
Adding function to OpenSpace that returns the license header
2016-04-14 10:27:59 -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