Commit Graph

76 Commits

Author SHA1 Message Date
Alexander Bock 8886eeec9d Compile fix for when globebrowsing is not available 2016-06-26 03:38:42 +02:00
Alexander Bock 3d4e1ec19c Merge branch 'develop' into release/ips
Conflicts:
	tests/main.cpp
2016-06-17 11:31:11 +02:00
Alexander Bock 227ad39e5b Make unit tests compile again
Update Ghoul version
2016-06-17 11:28:50 +02:00
Erik Broberg ff3ac1b368 Add Intersection test between ConvexHull2s, based on Separate Axis Theorem 2016-06-10 15:03:51 -04:00
Erik Broberg 2c89f36cbe Add class ConvexHull2 2016-06-10 13:49:50 -04:00
Erik Broberg c578941bab Fix include in unit tests 2016-06-10 13:17:23 -04:00
Jonathas Costa 335e183363 Fixed include path. 2016-06-08 14:34:04 -04:00
Kalle Bladin 674700d2b9 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-07 12:55:10 -04:00
Kalle Bladin 012bcaefaf Solve merge conflicts. 2016-06-07 12:54:52 -04:00
Erik Broberg 4ac7e5b533 Add a means of comparing AABBs and basic tests 2016-06-07 12:32:30 -04:00
Erik Broberg 1cd06aa3c8 Add basic tests for AABB contains and intersect 2016-06-07 12:02:27 -04:00
Erik Broberg 937cbabe21 Add method contains() to class AABB 2016-06-06 17:46:02 -04:00
Erik Broberg a9d34d4d25 Added thread pool class and a simple unit test 2016-05-16 20:28:16 -04:00
Erik Broberg e03258dab0 removed out-dated tests 2016-05-16 20:27:26 -04:00
Erik Broberg dbf7aa97ce Merged ChunkIndex and GeodeticTileIndex 2016-05-10 15:47:58 -04:00
Sebastian Piwell 39ff2415bb Name changes 2016-05-09 13:09:47 -04:00
Kalle Bladin cc4c035f6b Solve texture wrapping problem for clipmap rendering. 2016-05-04 19:46:05 -04:00
Sebastian Piwell 1e4e8919c3 Set attributes of screenspacerenderable through dictionary 2016-05-03 15:35:33 -04:00
Kalle Bladin e1f58ae5c9 Prototyping with four textures for clipmap rendering. 2016-05-02 16:47:51 -04:00
Kalle Bladin 32dc765c45 A simple test for PatchCoverageProvider 2016-05-02 12:29:18 -04:00
Erik Broberg eb40b8945b Change TwmsTileProvider to TileProvider 2016-04-28 17:54:51 -04:00
Erik Broberg 0613d6df4f resolved merge conflict (and installed gdal locally) 2016-04-28 13:23:14 -04:00
Erik Broberg 582c1044af Commented code to test tile loading with concurrent job manager. Texture Loader does not allow multithreading 2016-04-28 12:42:58 -04:00
Erik Broberg 4c133cdcce resolved conflict 2016-04-28 12:41:23 -04:00
Kalle Bladin 78339e909c Load TWMS using GDAL. Iimage is flipped in y direction and the reading is not general enough yet. 2016-04-27 23:21:42 -04:00
Erik Broberg 55fb54ffce Added templated ConcurrentJobManager to manage specific tasks in a separate thread 2016-04-27 19:22:39 -04:00
Kalle Bladin fb97493e77 Solve merge conflict. 2016-04-27 16:46:46 -04:00
Erik Broberg abfa1a15fb Added templated class ConcurrentJobManager skeleton 2016-04-27 16:29:43 -04:00
Kalle Bladin e98451ce13 Solve merge conflicts. 2016-04-27 16:19:35 -04:00
Erik Broberg dbf9293a31 Moved patchrenderer and frustumculler to folder rendering 2016-04-27 12:13:33 -04:00
Kalle Bladin 82ab4cc3d2 Fix bug in ellipsoid. 2016-04-27 12:05:28 -04:00
Kalle Bladin 57c8ca58bf Document code and start debugging Ellipsoid. 2016-04-25 20:55:39 -04:00
Erik Broberg 1799e2b488 Resolved merge conflicts 2016-04-25 16:14:04 -04:00
Erik Broberg e6195486ae GDAL trying opening WMS config file 2016-04-25 16:01:09 -04:00
Kalle Bladin c6c6e558db Change file names to match the new structure in test files. 2016-04-25 14:03:55 -04:00
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
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
Kalle Bladin c355976b55 Removed old test code 2016-04-20 16:45:42 -04:00
Kalle Bladin ae5b9fb1da Started testing GDAL 2016-04-20 10:54:12 -04:00
Erik Broberg 4f873e3f97 Resolved merge conflicts 2016-04-18 20:36:01 -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 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
Erik Broberg fafe4819e2 Added templated class LRUCache for Least-Recently-Used Caching 2016-04-15 18:05:11 -04:00
Erik Broberg d1b2acdead Removed out dated latlonpatch test 2016-04-11 12:06:35 -04:00
kbladin b0cd9fb7d7 Solve merge conflicts and changed rendering color for simple fragment shader. 2016-04-07 21:24:41 -04:00
Erik Broberg d0773bcf32 Distant dependent LOD geometry. Demo purpose only. 2016-04-07 20:54:52 -04:00
kbladin 83d55b87f8 Nurbs working to exactly define spherical patches. Ugly code but it can be cleaned up. 2016-04-07 20:49:52 -04:00