ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use reference when possible

Browse Source
This commit is contained in:
Benau
2016-11-28 13:34:45 +08:00
parent 45c5b0ffd6
commit 497b7e3f14
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/graphics/command_buffer.cpp
View File

@@ -21,7 +21,9 @@
// ----------------------------------------------------------------------------
template<>
void InstanceFiller<InstanceDataSingleTex>::add(GLMesh *mesh, InstanceSettings is, InstanceDataSingleTex &instance)
void InstanceFiller<InstanceDataSingleTex>::add(GLMesh* mesh,
const InstanceSettings& is,
InstanceDataSingleTex& instance)
{
fillOriginOrientationScale<InstanceDataSingleTex>(STK::tuple_get<0>(is), instance);
instance.Texture = mesh->TextureHandles[0];
@@ -29,7 +31,9 @@ void InstanceFiller<InstanceDataSingleTex>::add(GLMesh *mesh, InstanceSettings i
// ----------------------------------------------------------------------------
template<>
void InstanceFiller<InstanceDataDualTex>::add(GLMesh *mesh, InstanceSettings is, InstanceDataDualTex &instance)
void InstanceFiller<InstanceDataDualTex>::add(GLMesh* mesh,
const InstanceSettings& is,
InstanceDataDualTex& instance)
{
fillOriginOrientationScale<InstanceDataDualTex>(STK::tuple_get<0>(is), instance);
instance.Texture = mesh->TextureHandles[0];
@@ -38,7 +42,9 @@ void InstanceFiller<InstanceDataDualTex>::add(GLMesh *mesh, InstanceSettings is,
// ----------------------------------------------------------------------------
template<>
void InstanceFiller<InstanceDataThreeTex>::add(GLMesh *mesh, InstanceSettings is, InstanceDataThreeTex &instance)
void InstanceFiller<InstanceDataThreeTex>::add(GLMesh* mesh,
const InstanceSettings& is,
InstanceDataThreeTex& instance)
{
fillOriginOrientationScale<InstanceDataThreeTex>(STK::tuple_get<0>(is), instance);
instance.MiscData.X = STK::tuple_get<1>(is).X;
@@ -52,7 +58,9 @@ void InstanceFiller<InstanceDataThreeTex>::add(GLMesh *mesh, InstanceSettings is
// ----------------------------------------------------------------------------
template<>
void InstanceFiller<InstanceDataFourTex>::add(GLMesh *mesh, InstanceSettings is, InstanceDataFourTex &instance)
void InstanceFiller<InstanceDataFourTex>::add(GLMesh* mesh,
const InstanceSettings& is,
InstanceDataFourTex& instance)
{
fillOriginOrientationScale<InstanceDataFourTex>(STK::tuple_get<0>(is), instance);
instance.MiscData.X = STK::tuple_get<1>(is).X;
@@ -67,7 +75,9 @@ void InstanceFiller<InstanceDataFourTex>::add(GLMesh *mesh, InstanceSettings is,
// ----------------------------------------------------------------------------
template<>
void InstanceFiller<GlowInstanceData>::add(GLMesh *mesh, InstanceSettings is, GlowInstanceData &instance)
void InstanceFiller<GlowInstanceData>::add(GLMesh* mesh,
const InstanceSettings& is,
GlowInstanceData& instance)
{
scene::ISceneNode* node = STK::tuple_get<0>(is);
fillOriginOrientationScale<GlowInstanceData>(node, instance);

4
src/graphics/command_buffer.hpp
View File

@@ -69,7 +69,7 @@ void fillOriginOrientationScale(scene::ISceneNode *node, InstanceData &instance)
template<typename InstanceData>
struct InstanceFiller
{
static void add(GLMesh *, InstanceSettings, InstanceData &);
static void add(GLMesh *, const InstanceSettings&, InstanceData &);
};
// ----------------------------------------------------------------------------
@@ -84,7 +84,7 @@ struct InstanceFiller
* \param[in,out] poly_count Number of triangles. Will be updated.
*/
template<typename T>
void FillInstances_impl(InstanceList instance_list,
void FillInstances_impl(const InstanceList& instance_list,
T * instance_buffer,
DrawElementsIndirectCommand *command_buffer,
size_t &instance_buffer_offset,