Erik Broberg
473c7782c2
resolved merge conflict
2016-04-25 12:35:28 -04:00
Erik Broberg
f253edad53
Proof of concept - real time tile fetching
2016-04-25 12:25:11 -04:00
Kalle Bladin
198c284e23
Using number of segments per patch in rendering.
2016-04-22 12:38:13 -04:00
Kalle Bladin
3c8434bee0
Rename resolution to segments in grid classes.
2016-04-22 12:14:37 -04:00
Kalle Bladin
47da09064e
Redefine x resolution and y resolution to be the number of grid cells in each direction.
2016-04-22 11:53:52 -04:00
Kalle Bladin
aaf86ca86f
Add class InnerClipMapGrid which renders the last part of the clipmap.
2016-04-22 11:28:54 -04:00
Kalle Bladin
c7bfe0b2c0
Changed structure for grid classes.
2016-04-21 21:46:49 -04:00
Kalle Bladin
17a83c0270
Convert from gdal format to Texture
2016-04-21 17:43:08 -04:00
Erik Broberg
3d1db76c16
Merge branch 'develop' into feature/globebrowsing
2016-04-21 17:07:18 -04:00
Erik Broberg
069c9f51d8
merge
2016-04-21 14:23:21 -04:00
Erik Broberg
3432605e7b
ChunkNode merges its children facing away from the camera as much as possible without being visible to the camera. Test by enabling front face culling.
2016-04-21 14:07:06 -04:00
Erik Broberg
f35cd4bb99
Added templated Angle class to handle angle arithmics
2016-04-21 14:03:21 -04:00
Alexander Bock
def64f7c24
Correctly clear imageprojections in case the base texture is not RGB
2016-04-20 23:15:34 +02:00
Kalle Bladin
c355976b55
Removed old test code
2016-04-20 16:45:42 -04:00
Alexander Bock
0c9c5c397e
Fixing crawling bug when encountering images with different length
2016-04-20 19:56:49 +02:00
Alexander Bock
193fb14117
Commit Python script that crawls the New Horizons public webpage for images
2016-04-20 19:34:23 +02:00
Kalle Bladin
97250b3c53
Merge branch 'develop' into feature/globebrowsing
2016-04-20 10:54:50 -04:00
Kalle Bladin
ae5b9fb1da
Started testing GDAL
2016-04-20 10:54:12 -04:00
Alexander Bock
c5abfd1cea
Update Ghoul repository
2016-04-20 15:49:36 +02:00
Alexander Bock
4b4a7805c2
Fix the image orientation in the FBO passing for planetprojection
2016-04-20 15:44:06 +02:00
Alexander Bock
5f69f995c3
Update gitignore for new NewHorizons texture
2016-04-20 14:28:47 +02:00
Alexander Bock
c14aa7b11b
Fix inverted texture problem
...
- Change texture indices of PowerScaledSphere
- Change texture generation in FBOBass for projections
- Updated NewHorizons to download unflipped texture
- Use new Ghoul version
2016-04-20 14:28:11 +02:00
Alexander Bock
ea91d50b87
Start correcting fixes for wrong image origin
2016-04-20 13:07:01 +02:00
Alexander Bock
acc6095ba3
Removing classes PlanetGeometryProject and SimpleSphereGeometryProjection and replace their use with the generic PlanetGeometry and SImpleSphereGeometry classes
2016-04-20 13:06:40 +02:00
Alexander Bock
53e482b40e
Use correct Mars SPICE constants
2016-04-20 09:58:11 +02:00
Kalle Bladin
f819ca771f
Changed documentation style.
2016-04-19 19:47:59 -04:00
Kalle Bladin
5531446f5d
Rendering of clip maps is now more convenient.
2016-04-19 19:38:47 -04:00
Kalle Bladin
6ff6ff1ace
Smallest patch of clipmap is rendered separately.
2016-04-19 18:42:25 -04:00
Kalle Bladin
152126f5a4
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
2016-04-19 15:51:28 -04:00
Alexander Bock
b11557ca6f
Include GDAL as external in globebrowing CMakeLists
2016-04-19 21:34:26 +02:00
Kalle Bladin
9146fc48c8
Restructured and commented.
2016-04-19 15:20:18 -04:00
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