Merge branch 'release/v0.7.1'

vrsys · May 21, 2014 · 7731e88 · 7731e88
2 parents 44159b5 + 1ab3415
commit 7731e88
Show file tree

Hide file tree

Showing 37 changed files with 1,152 additions and 928 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ PROJECT(GUACAMOLE CXX)
 # version number
 set(GUACAMOLE_MAJOR 0)
 set(GUACAMOLE_MINOR 7)
-set(GUACAMOLE_PATCH 0)
+set(GUACAMOLE_PATCH 1)
 set(GUACAMOLE_VERSION ${GUACAMOLE_MAJOR}.${GUACAMOLE_MINOR}.${GUACAMOLE_PATCH})
 set(GUACAMOLE_DESCRIPTION "GUACAMOLE - an astonishing virtual reality engine")
 set(GUACAMOLE_HOMEPAGE "http://www.GUACAMOLE.org")

diff --git a/include/gua/renderer/CompositePass.hpp b/include/gua/renderer/CompositePass.hpp
@@ -1,88 +1,89 @@
-/******************************************************************************
- * guacamole - delicious VR                                                   *
- *                                                                            *
- * Copyright: (c) 2011-2013 Bauhaus-Universität Weimar                        *
- * Contact:   felix.lauer@uni-weimar.de / simon.schneegans@uni-weimar.de      *
- *                                                                            *
- * This program is free software: you can redistribute it and/or modify it    *
- * under the terms of the GNU General Public License as published by the Free *
- * Software Foundation, either version 3 of the License, or (at your option)  *
- * any later version.                                                         *
- *                                                                            *
- * This program is distributed in the hope that it will be useful, but        *
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License   *
- * for more details.                                                          *
- *                                                                            *
- * You should have received a copy of the GNU General Public License along    *
- * with this program. If not, see <http://www.gnu.org/licenses/>.             *
- *                                                                            *
- ******************************************************************************/
-
-#ifndef GUA_COMPOSITE_PASS_HPP
-#define GUA_COMPOSITE_PASS_HPP
-
-// guacamole headers
-#include <gua/renderer/BuiltInTextures.hpp>
-#include <gua/renderer/GeometryPass.hpp>
-#include <gua/renderer/StereoBuffer.hpp>
-
-namespace gua {
-
-class GBuffer;
-
-/**
- *
- */
-class CompositePass : public Pass {
- public:
-
-  /**
-   *
-   */
-	 CompositePass(Pipeline* pipeline);
-
-  /**
-   *
-   */
-	virtual ~CompositePass();
-
-  virtual void create(RenderContext const& ctx,
-                      std::vector<std::pair<BufferComponent,
-                      scm::gl::sampler_state_desc> > const& layers);
-
-  /* virtual */ LayerMapping const* get_gbuffer_mapping() const;
-
-  void print_shaders(std::string const& directory,
-                     std::string const& name) const;
-
-  bool pre_compile_shaders(RenderContext const& ctx);
-
-  /* virtual */ void render_scene(Camera const& camera,
-                                  SceneGraph const&,
-                                  RenderContext const& ctx);
-
-protected :
-
-  /* virtual */ void rendering( SerializedScene const& scene,
-                                RenderContext const& ctx,
-                                CameraMode eye,
-                                Camera const& camera,
-                                FrameBufferObject* target);
-
-  void init_resources (RenderContext const& ctx);
-
- private:
-
-  GBuffer* volume_raygeneration_buffer_;
-
-  scm::gl::depth_stencil_state_ptr depth_stencil_state_;
-  scm::gl::quad_geometry_ptr fullscreen_quad_;
-
-  ShaderProgram* composite_shader_;
-  ShaderProgram* ray_generation_shader_;
-};
-
-}
-
-#endif  // GUA_COMPOSITE_PASS_HPP
+/******************************************************************************
+ * guacamole - delicious VR                                                   *
+ *                                                                            *
+ * Copyright: (c) 2011-2013 Bauhaus-Universität Weimar                        *
+ * Contact:   felix.lauer@uni-weimar.de / simon.schneegans@uni-weimar.de      *
+ *                                                                            *
+ * This program is free software: you can redistribute it and/or modify it    *
+ * under the terms of the GNU General Public License as published by the Free *
+ * Software Foundation, either version 3 of the License, or (at your option)  *
+ * any later version.                                                         *
+ *                                                                            *
+ * This program is distributed in the hope that it will be useful, but        *
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License   *
+ * for more details.                                                          *
+ *                                                                            *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program. If not, see <http://www.gnu.org/licenses/>.             *
+ *                                                                            *
+ ******************************************************************************/
+
+#ifndef GUA_COMPOSITE_PASS_HPP
+#define GUA_COMPOSITE_PASS_HPP
+
+// guacamole headers
+#include <gua/renderer/BuiltInTextures.hpp>
+#include <gua/renderer/GeometryPass.hpp>
+#include <gua/renderer/StereoBuffer.hpp>
+
+namespace gua {
+
+class GBuffer;
+
+/**
+ *
+ */
+class CompositePass : public Pass {
+ public:
+
+  /**
+   *
+   */
+	 CompositePass(Pipeline* pipeline);
+
+  /**
+   *
+   */
+	virtual ~CompositePass();
+
+  virtual void create(RenderContext const& ctx,
+                      std::vector<std::pair<BufferComponent,
+                      scm::gl::sampler_state_desc> > const& layers);
+
+  /* virtual */ LayerMapping const* get_gbuffer_mapping() const;
+
+  void print_shaders(std::string const& directory,
+                     std::string const& name) const;
+
+  bool pre_compile_shaders(RenderContext const& ctx);
+
+  /* virtual */ void render_scene(Camera const& camera,
+                                  SceneGraph const&,
+                                  RenderContext const& ctx,
+                                  std::size_t viewid);
+
+protected :
+
+  /* virtual */ void rendering( SerializedScene const& scene,
+                                RenderContext const& ctx,
+                                CameraMode eye,
+                                Camera const& camera,
+                                FrameBufferObject* target);
+
+  void init_resources (RenderContext const& ctx);
+
+ private:
+
+  GBuffer* volume_raygeneration_buffer_;
+
+  scm::gl::depth_stencil_state_ptr depth_stencil_state_;
+  scm::gl::quad_geometry_ptr fullscreen_quad_;
+
+  ShaderProgram* composite_shader_;
+  ShaderProgram* ray_generation_shader_;
+};
+
+}
+
+#endif  // GUA_COMPOSITE_PASS_HPP