Solve merge conflict and add properties for friction and interaction parameters.

2026-04-24 04:58:59 -05:00 · 2016-06-30 14:07:51 -04:00
parent d4f89448e0 e40d393824
commit a89f474502
238 changed files with 3637 additions and 4131 deletions
@@ -38,9 +38,9 @@
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtc/quaternion.hpp>

-#include <iostream>
-
 namespace openspace {
+    class SyncBuffer;
+
    /**
    This class still needs some more love. Suggested improvements:
    - Remove psc from the camera class interface.