Solve merge conflict.

2026-04-23 20:50:59 -05:00 · 2016-05-12 11:46:59 -04:00
parent 4e95aaab82 f825efa5e5
commit ec8299da69
16 changed files with 262 additions and 135 deletions
@@ -38,13 +38,27 @@

 namespace openspace {

-    class LonLatPatch;
    using namespace glm;


+
+
    class FrustumCuller {
    public:

+        enum PointTestResult : int {
+            Inside = 0,
+            Above,
+            AboveRight,
+            Right,
+            BelowRight,
+            Below,
+            BelowLeft,
+            Left,
+            AboveLeft
+        };
+
+
        FrustumCuller();
        ~FrustumCuller();