Bs is now Fs

include/anki/renderer/Common.h

@@ -0,0 +1,16 @@
+// Copyright (C) 2009-2015, Panagiotis Christopoulos Charitos.
+// All rights reserved.
+// Code licensed under the BSD License.
+// http://www.anki3d.org/LICENSE
+
+#ifndef ANKI_RENDERER_COMMON_H
+#define ANKI_RENDERER_COMMON_H
+
+namespace anki {
+
+// Forward
+class Fs;
+
+} // end namespace anki
+
+#endif

include/anki/renderer/Bs.h → include/anki/renderer/Fs.h

@@ -13,15 +13,15 @@ namespace anki {
 /// @addtogroup renderer
 /// @{
 
-/// Blending stage. The objects that blend must be handled differently
-class Bs: public RenderingPass
+/// Forward rendering stage. The objects that blend must be handled differently
+class Fs: public RenderingPass
 {
 public:
-	Bs(Renderer* r)
+	Fs(Renderer* r)
 	:	RenderingPass(r) 
 	{}
 
-	~Bs();
+	~Fs();
 
 	ANKI_USE_RESULT Error init(const ConfigSet& initializer);
 	ANKI_USE_RESULT Error run(GlCommandBufferHandle& cmdb);
@@ -29,7 +29,6 @@ public:
 private:
 	GlFramebufferHandle m_fb;
 };
-
 /// @}
 
 } // end namespace anki

include/anki/renderer/Renderer.h

@@ -6,6 +6,7 @@
 #ifndef ANKI_RENDERER_RENDERER_H
 #define ANKI_RENDERER_RENDERER_H
 
+#include "anki/renderer/Common.h"
 #include "anki/Math.h"
 #include "anki/resource/ResourceManager.h"
 #include "anki/resource/TextureResource.h"
@@ -18,7 +19,6 @@
 #include "anki/renderer/Dp.h"
 #include "anki/renderer/Is.h"
 #include "anki/renderer/Pps.h"
-#include "anki/renderer/Bs.h"
 #include "anki/renderer/Dbg.h"
 #include "anki/renderer/Tiler.h"
 #include "anki/renderer/Drawer.h"
@@ -292,7 +292,7 @@ private:
 	Dp m_dp; ///< Depth processing stage.
 	Is m_is; ///< Illumination rendering stage
 	Pps m_pps; ///< Postprocessing rendering stage
-	Bs m_bs; ///< Blending stage
+	Fs* m_fs = nullptr; ///< Forward shading.
 	Dbg m_dbg; ///< Debug stage
 	Tiler m_tiler;
 	/// @}

src/renderer/Bs.cpp → src/renderer/Fs.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "anki/renderer/Bs.h"
+#include "anki/renderer/Fs.h"
 #include "anki/renderer/Renderer.h"
 #include "anki/scene/SceneGraph.h"
 #include "anki/scene/Camera.h"
@@ -11,11 +11,11 @@
 namespace anki {
 
 //==============================================================================
-Bs::~Bs()
+Fs::~Fs()
 {}
 
 //==============================================================================
-Error Bs::init(const ConfigSet&)
+Error Fs::init(const ConfigSet&)
 {
 	GlCommandBufferHandle cmdb;
 	Error err = cmdb.create(&getGlDevice());
@@ -35,7 +35,7 @@ Error Bs::init(const ConfigSet&)
 }
 
 //==============================================================================
-Error Bs::run(GlCommandBufferHandle& cmdb)
+Error Fs::run(GlCommandBufferHandle& cmdb)
 {
 	Error err = ErrorCode::NONE;
 

src/renderer/Renderer.cpp

@@ -9,6 +9,8 @@
 #include "anki/core/Counters.h"
 #include "anki/misc/ConfigSet.h"
 
+#include "anki/renderer/Fs.h"
+
 namespace anki {
 
 //==============================================================================
@@ -17,7 +19,6 @@ Renderer::Renderer()
 	m_dp(this), 
 	m_is(this),
 	m_pps(this),
-	m_bs(this),
 	m_dbg(this), 
 	m_tiler(this)
 {}
@@ -132,8 +133,13 @@ Error Renderer::initInternal(const ConfigSet& config)
 	if(err) return err;
 	err = m_is.init(config);
 	if(err) return err;
-	err = m_bs.init(config);
-	if(err) return err;
+	
+	m_fs = m_alloc.newInstance<Fs>(this);
+	if(err = m_fs->init(config))
+	{
+		return err;
+	}
+	
 	err = m_pps.init(config);
 	if(err) return err;
 	err = m_dbg.init(config);
@@ -198,8 +204,10 @@ Error Renderer::render(SceneGraph& scene,
 	if(err) return err;
 	ANKI_COUNTER_STOP_TIMER_INC(RENDERER_IS_TIME);
 
-	err = m_bs.run(cmdBuff[1]);
-	if(err) return err;
+	if(err = m_fs->run(cmdBuff[1])) 
+	{
+		return err;
+	}
 
 	err = m_dp.run(cmdBuff[1]);
 	if(err) return err;