Skip to content

Commit 7c5fbf1

Browse files
methylDragonchapulina
methylDragon
and
chapulina
authored
ign -> gz Provisional Finale: Source Migration : gz-rendering (#672)
Signed-off-by: methylDragon <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Louise Poubel <[email protected]>
1 parent b0c83c3 commit 7c5fbf1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+239
-218
lines changed

‎Changelog.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
### Gazebo Rendering 6.3.1 (2022-04-13)
1010

11-
1. Revert OGRE-Next custom support and back to use IgnOGRE2 module
11+
1. Revert OGRE-Next custom support and back to use GzOGRE2 module
1212
* [Pull request #605](https://github.com/gazebosim/gz-rendering/pull/605)
1313

1414
### Gazebo Rendering 6.3.0 (2022-04-06)

‎Migration.md

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ release will remove the deprecated code.
2727
3. `IGN_VISIBILITY_SELECTION`
2828
4. `IGN_VISIBILITY_GUI`
2929
5. `IGN_VISIBILITY_SELECTABLE`
30+
7. The `IgnRenderingMode` enum is deprecated and will be removed in future versions. Use `GzRenderingMode` instead.
31+
1. Similarly, the `IORM_` prefixed enum values are deprecated. Use the `GORM_` prefix instead.
32+
2. Also, `Ogre2RenderEngine->SetIgnOgreRenderingMode` is deprecated and will be removed. Use `Ogre2RenderEngine->SetGzOgreRenderingMode` instead.
3033

3134
### Breaking Changes
3235

‎include/gz/rendering/base/base.hh.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// Automatically generated
22
#include <gz/${GZ_PROJECT_NAME}/config.hh>
3-
${ign_headers}
3+
${gz_headers}

‎include/gz/rendering/rendering.hh.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// Automatically generated
22
//#include <gz/${GZ_PROJECT_NAME}/config.hh>
3-
${ign_headers}
3+
${gz_headers}

‎ogre/include/gz/rendering/ogre/OgreConversions.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace gz
3232
{
3333
inline namespace GZ_RENDERING_VERSION_NAMESPACE {
3434
//
35-
/// \addtogroup ign_rendering
35+
/// \addtogroup gz_rendering
3636
/// \{
3737

3838
/// \brief Conversions Conversions.hh rendering/Conversions.hh

‎ogre/include/gz/rendering/ogre/OgreRTShaderSystem.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace gz
3434
// forward declaration
3535
class OgreRTShaderSystemPrivate;
3636

37-
/// \addtogroup ign_rendering
37+
/// \addtogroup gz_rendering
3838
/// \{
3939

4040
/// \class OgreRTShaderSystem OgreRTShaderSystem.hh rendering/rendering.hh

‎ogre/include/gz/rendering/ogre/ogre.hh.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// Automatically generated
22
#include <gz/${GZ_PROJECT_NAME}/config.hh>
3-
${ign_headers}
3+
${gz_headers}

‎ogre/src/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ target_link_libraries(${ogre_target}
3737
PRIVATE
3838
gz-plugin${GZ_PLUGIN_VER}::register
3939
${OPENGL_LIBRARIES}
40-
IgnOGRE::IgnOGRE
40+
GzOGRE::GzOGRE
4141
)
4242

4343
# Build the unit tests

‎ogre/src/OgreHeightmap.cc

+41-41
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ using Ogre::TechniqueType;
4848
/// A custom material generator that lets Gazebo use GLSL shaders
4949
/// (as opposed to the default Cg shaders provided by Ogre) for rendering
5050
/// terrain.
51-
class IgnTerrainMatGen : public Ogre::TerrainMaterialGeneratorA
51+
class GzTerrainMatGen : public Ogre::TerrainMaterialGeneratorA
5252
{
5353
/// \brief Constructor
54-
public: IgnTerrainMatGen();
54+
public: GzTerrainMatGen();
5555

5656
/// \brief Destructor
57-
public: virtual ~IgnTerrainMatGen();
57+
public: virtual ~GzTerrainMatGen();
5858

5959
/// \brief Shader model 2 profile target.
6060
public: class SM2Profile :
@@ -404,7 +404,7 @@ class gz::rendering::OgreHeightmapPrivate
404404

405405
#if OGRE_VERSION_MAJOR == 1 && OGRE_VERSION_MINOR < 11
406406
/// \brief Pointer to the terrain material generator.
407-
public: IgnTerrainMatGen *ignMatGen{nullptr};
407+
public: GzTerrainMatGen *gzMatGen{nullptr};
408408
#endif
409409
};
410410

@@ -1010,11 +1010,11 @@ void OgreHeightmap::CreateMaterial()
10101010
#if OGRE_VERSION_MAJOR == 1 && OGRE_VERSION_MINOR < 11
10111011
// use default material
10121012
// RTSS PSSM shadows compatible terrain material
1013-
if (!this->dataPtr->ignMatGen)
1014-
this->dataPtr->ignMatGen = new IgnTerrainMatGen();
1013+
if (!this->dataPtr->gzMatGen)
1014+
this->dataPtr->gzMatGen = new GzTerrainMatGen();
10151015

10161016
auto ptr = Ogre::TerrainMaterialGeneratorPtr();
1017-
ptr.bind(this->dataPtr->ignMatGen);
1017+
ptr.bind(this->dataPtr->gzMatGen);
10181018

10191019
this->dataPtr->terrainGlobals->setDefaultMaterialGenerator(ptr);
10201020
#else
@@ -1040,7 +1040,7 @@ void OgreHeightmap::SetupShadows(bool _enableShadows)
10401040
// Assume we get a shader model 2 material profile
10411041
Ogre::TerrainMaterialGeneratorA::SM2Profile *matProfile;
10421042
#if OGRE_VERSION_MAJOR == 1 && OGRE_VERSION_MINOR < 11
1043-
matProfile = static_cast<IgnTerrainMatGen::SM2Profile *>(
1043+
matProfile = static_cast<GzTerrainMatGen::SM2Profile *>(
10441044
matGen->getActiveProfile());
10451045
#else
10461046
matProfile = static_cast<Ogre::TerrainMaterialGeneratorA::SM2Profile *>(
@@ -1157,14 +1157,14 @@ MaterialPtr OgreHeightmap::Material() const
11571157

11581158
/////////////////////////////////////////////////
11591159
/////////////////////////////////////////////////
1160-
// IgnTerrainMatGen
1160+
// GzTerrainMatGen
11611161
/////////////////////////////////////////////////
11621162
/////////////////////////////////////////////////
11631163

11641164
#if OGRE_VERSION_MAJOR == 1 && OGRE_VERSION_MINOR < 11
11651165

11661166
/////////////////////////////////////////////////
1167-
IgnTerrainMatGen::IgnTerrainMatGen()
1167+
GzTerrainMatGen::GzTerrainMatGen()
11681168
: TerrainMaterialGeneratorA()
11691169
{
11701170
/// \TODO(anyone) - This will have to be changed if TerrainMaterialGeneratorA
@@ -1183,12 +1183,12 @@ IgnTerrainMatGen::IgnTerrainMatGen()
11831183
}
11841184

11851185
/////////////////////////////////////////////////
1186-
IgnTerrainMatGen::~IgnTerrainMatGen()
1186+
GzTerrainMatGen::~GzTerrainMatGen()
11871187
{
11881188
}
11891189

11901190
/////////////////////////////////////////////////
1191-
IgnTerrainMatGen::SM2Profile::SM2Profile(
1191+
GzTerrainMatGen::SM2Profile::SM2Profile(
11921192
Ogre::TerrainMaterialGenerator *_parent, const Ogre::String &_name,
11931193
const Ogre::String &_desc)
11941194
: TerrainMaterialGeneratorA::SM2Profile(_parent, _name, _desc)
@@ -1197,15 +1197,15 @@ IgnTerrainMatGen::SM2Profile::SM2Profile(
11971197
}
11981198

11991199
/////////////////////////////////////////////////
1200-
IgnTerrainMatGen::SM2Profile::~SM2Profile()
1200+
GzTerrainMatGen::SM2Profile::~SM2Profile()
12011201
{
12021202
// Because the base SM2Profile has no virtual destructor:
12031203
delete this->mShaderGen;
12041204
this->mShaderGen = nullptr;
12051205
}
12061206

12071207
/////////////////////////////////////////////////
1208-
void IgnTerrainMatGen::SM2Profile::addTechnique(
1208+
void GzTerrainMatGen::SM2Profile::addTechnique(
12091209
const Ogre::MaterialPtr &_mat, const Ogre::Terrain *_terrain,
12101210
TechniqueType _tt)
12111211
{
@@ -1221,7 +1221,7 @@ void IgnTerrainMatGen::SM2Profile::addTechnique(
12211221
if (hmgr.isLanguageSupported("glsl"))
12221222
{
12231223
this->mShaderGen = OGRE_NEW
1224-
IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL();
1224+
GzTerrainMatGen::SM2Profile::ShaderHelperGLSL();
12251225
}
12261226
else
12271227
{
@@ -1250,14 +1250,14 @@ void IgnTerrainMatGen::SM2Profile::addTechnique(
12501250

12511251
// Doesn't delegate to the proper method otherwise
12521252
Ogre::HighLevelGpuProgramPtr vprog =
1253-
((IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL*)this->mShaderGen)
1253+
((GzTerrainMatGen::SM2Profile::ShaderHelperGLSL*)this->mShaderGen)
12541254
->generateVertexProgram(this, _terrain, _tt);
12551255

12561256
// DEBUG: std::cout << "VertShader[" << vprog->getName() << "]:\n"
12571257
// << vprog->getSource() << "\n\n";
12581258

12591259
Ogre::HighLevelGpuProgramPtr fprog =
1260-
((IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL*)this->mShaderGen)
1260+
((GzTerrainMatGen::SM2Profile::ShaderHelperGLSL*)this->mShaderGen)
12611261
->generateFragmentProgram(this, _terrain, _tt);
12621262

12631263
// DEBUG: std::cout << "FragShader[" << fprog->getName() << "]:\n"
@@ -1347,7 +1347,7 @@ void IgnTerrainMatGen::SM2Profile::addTechnique(
13471347
// generate() and generateForCompositeMap() are identical to
13481348
// TerrainMaterialGeneratorA implementation, the only reason for repeating
13491349
// them is that, unfortunately, addTechnique() is not declared virtual.
1350-
Ogre::MaterialPtr IgnTerrainMatGen::SM2Profile::generate(
1350+
Ogre::MaterialPtr GzTerrainMatGen::SM2Profile::generate(
13511351
const Ogre::Terrain *_terrain)
13521352
{
13531353
// re-use old material if exists
@@ -1408,7 +1408,7 @@ Ogre::MaterialPtr IgnTerrainMatGen::SM2Profile::generate(
14081408
}
14091409

14101410
/////////////////////////////////////////////////
1411-
Ogre::MaterialPtr IgnTerrainMatGen::SM2Profile::generateForCompositeMap(
1411+
Ogre::MaterialPtr GzTerrainMatGen::SM2Profile::generateForCompositeMap(
14121412
const Ogre::Terrain *_terrain)
14131413
{
14141414
// re-use old material if exists
@@ -1442,19 +1442,19 @@ Ogre::MaterialPtr IgnTerrainMatGen::SM2Profile::generateForCompositeMap(
14421442
}
14431443

14441444
/////////////////////////////////////////////////
1445-
void IgnTerrainMatGen::SM2Profile::UpdateParams(const Ogre::MaterialPtr &_mat,
1445+
void GzTerrainMatGen::SM2Profile::UpdateParams(const Ogre::MaterialPtr &_mat,
14461446
const Ogre::Terrain *_terrain)
14471447
{
1448-
static_cast<IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL*>(
1448+
static_cast<GzTerrainMatGen::SM2Profile::ShaderHelperGLSL*>(
14491449
this->mShaderGen)->updateParams(this, _mat, _terrain, false);
14501450
}
14511451

14521452
/////////////////////////////////////////////////
1453-
void IgnTerrainMatGen::SM2Profile::UpdateParamsForCompositeMap(
1453+
void GzTerrainMatGen::SM2Profile::UpdateParamsForCompositeMap(
14541454
const Ogre::MaterialPtr &_mat, const Ogre::Terrain *_terrain)
14551455
{
14561456
// Only tested for Ogre 1.11 & 1.12
1457-
static_cast<IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL*>(
1457+
static_cast<GzTerrainMatGen::SM2Profile::ShaderHelperGLSL*>(
14581458
this->mShaderGen)->updateParams(this, _mat, _terrain, true);
14591459
}
14601460

@@ -1466,7 +1466,7 @@ void IgnTerrainMatGen::SM2Profile::UpdateParamsForCompositeMap(
14661466

14671467
/////////////////////////////////////////////////
14681468
Ogre::HighLevelGpuProgramPtr
1469-
IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateVertexProgram(
1469+
GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateVertexProgram(
14701470
const SM2Profile *_prof, const Ogre::Terrain *_terrain,
14711471
TechniqueType _tt)
14721472
{
@@ -1485,7 +1485,7 @@ IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateVertexProgram(
14851485

14861486
/////////////////////////////////////////////////
14871487
Ogre::HighLevelGpuProgramPtr
1488-
IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFragmentProgram(
1488+
GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFragmentProgram(
14891489
const SM2Profile *_prof, const Ogre::Terrain *_terrain, TechniqueType _tt)
14901490
{
14911491
Ogre::HighLevelGpuProgramPtr ret = this->createFragmentProgram(_prof,
@@ -1563,7 +1563,7 @@ IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFragmentProgram(
15631563
}
15641564

15651565
/////////////////////////////////////////////////
1566-
void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::updateParams(
1566+
void GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::updateParams(
15671567
const SM2Profile *_prof, const Ogre::MaterialPtr &_mat,
15681568
const Ogre::Terrain *_terrain, bool _compositeMap)
15691569
{
@@ -1597,7 +1597,7 @@ void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::updateParams(
15971597
}
15981598

15991599
/////////////////////////////////////////////////
1600-
void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::
1600+
void GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::
16011601
generateVertexProgramSource(const SM2Profile *_prof,
16021602
const Ogre::Terrain* _terrain, TechniqueType _tt,
16031603
Ogre::StringStream &_outStream)
@@ -1622,7 +1622,7 @@ generateVertexProgramSource(const SM2Profile *_prof,
16221622
// TerrainMaterialGeneratorA::SM2Profile::ShaderHelperGLSL::generateVpHeader()
16231623
// but is needed because generateVpDynamicShadowsParams() is not declared
16241624
// virtual.
1625-
void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateVpHeader(
1625+
void GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateVpHeader(
16261626
const SM2Profile *_prof, const Ogre::Terrain *_terrain,
16271627
TechniqueType _tt, Ogre::StringStream &_outStream)
16281628
{
@@ -1815,7 +1815,7 @@ void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateVpHeader(
18151815
// This method is identical to
18161816
// TerrainMaterialGeneratorA::SM2Profile::ShaderHelperGLSL::generateVpFooter()
18171817
// but is needed because generateVpDynamicShadows() is not declared virtual.
1818-
void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateVpFooter(
1818+
void GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateVpFooter(
18191819
const SM2Profile *_prof, const Ogre::Terrain *_terrain,
18201820
TechniqueType _tt, Ogre::StringStream &_outStream)
18211821
{
@@ -1846,7 +1846,7 @@ void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateVpFooter(
18461846

18471847
/////////////////////////////////////////////////
18481848
void
1849-
IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateVpDynamicShadows(
1849+
GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateVpDynamicShadows(
18501850
const SM2Profile *_prof, const Ogre::Terrain * /*_terrain*/,
18511851
TechniqueType /*_tt*/, Ogre::StringStream &_outStream)
18521852
{
@@ -1881,7 +1881,7 @@ IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateVpDynamicShadows(
18811881
}
18821882

18831883
/////////////////////////////////////////////////
1884-
void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::defaultVpParams(
1884+
void GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::defaultVpParams(
18851885
const SM2Profile *_prof, const Ogre::Terrain *_terrain,
18861886
TechniqueType _tt, const Ogre::HighLevelGpuProgramPtr &_prog)
18871887
{
@@ -1935,7 +1935,7 @@ void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::defaultVpParams(
19351935
}
19361936

19371937
/////////////////////////////////////////////////
1938-
unsigned int IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::
1938+
unsigned int GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::
19391939
generateVpDynamicShadowsParams(unsigned int _texCoord, const SM2Profile *_prof,
19401940
const Ogre::Terrain * /*_terrain*/, TechniqueType /*_tt*/,
19411941
Ogre::StringStream &_outStream)
@@ -1965,7 +1965,7 @@ generateVpDynamicShadowsParams(unsigned int _texCoord, const SM2Profile *_prof,
19651965
}
19661966

19671967
/////////////////////////////////////////////////
1968-
void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpHeader(
1968+
void GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpHeader(
19691969
const SM2Profile *_prof, const Ogre::Terrain *_terrain,
19701970
TechniqueType _tt, Ogre::StringStream &_outStream)
19711971
{
@@ -2196,7 +2196,7 @@ void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpHeader(
21962196

21972197
/////////////////////////////////////////////////
21982198
void
2199-
IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpDynamicShadowsParams(
2199+
GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpDynamicShadowsParams(
22002200
Ogre::uint *_texCoord, Ogre::uint *_sampler, const SM2Profile *_prof,
22012201
const Ogre::Terrain * /*_terrain*/, TechniqueType _tt,
22022202
Ogre::StringStream &_outStream)
@@ -2232,7 +2232,7 @@ IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpDynamicShadowsParams(
22322232
}
22332233

22342234
/////////////////////////////////////////////////
2235-
void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpLayer(
2235+
void GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpLayer(
22362236
const SM2Profile *_prof, const Ogre::Terrain * /*_terrain*/,
22372237
TechniqueType _tt, Ogre::uint _layer,
22382238
Ogre::StringStream &_outStream)
@@ -2311,7 +2311,7 @@ void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpLayer(
23112311
}
23122312

23132313
/////////////////////////////////////////////////
2314-
void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpFooter(
2314+
void GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpFooter(
23152315
const SM2Profile *_prof, const Ogre::Terrain *_terrain,
23162316
TechniqueType _tt, Ogre::StringStream &_outStream)
23172317
{
@@ -2391,7 +2391,7 @@ void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpFooter(
23912391

23922392
/////////////////////////////////////////////////
23932393
void
2394-
IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpDynamicShadowsHelpers(
2394+
GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpDynamicShadowsHelpers(
23952395
const SM2Profile *_prof, const Ogre::Terrain * /*_terrain*/,
23962396
TechniqueType /*_tt*/, Ogre::StringStream &_outStream)
23972397
{
@@ -2529,7 +2529,7 @@ IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpDynamicShadowsHelpers(
25292529
}
25302530

25312531
/////////////////////////////////////////////////
2532-
void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpDynamicShadows(
2532+
void GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpDynamicShadows(
25332533
const SM2Profile *_prof, const Ogre::Terrain * /*_terrain*/,
25342534
TechniqueType /*_tt*/, Ogre::StringStream &_outStream)
25352535
{
@@ -2587,7 +2587,7 @@ void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFpDynamicShadows(
25872587

25882588
/////////////////////////////////////////////////
25892589
void
2590-
IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFragmentProgramSource(
2590+
GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFragmentProgramSource(
25912591
const SM2Profile *_prof, const Ogre::Terrain *_terrain,
25922592
TechniqueType _tt, Ogre::StringStream &_outStream)
25932593
{
@@ -2607,7 +2607,7 @@ IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::generateFragmentProgramSource(
26072607
}
26082608

26092609
/////////////////////////////////////////////////
2610-
void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::updateVpParams(
2610+
void GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::updateVpParams(
26112611
const SM2Profile *_prof, const Ogre::Terrain *_terrain,
26122612
#if OGRE_VERSION_MAJOR >= 1 && OGRE_VERSION_MINOR >= 8
26132613
TechniqueType _tt,
@@ -2647,7 +2647,7 @@ void IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::updateVpParams(
26472647
}
26482648

26492649
/////////////////////////////////////////////////
2650-
Ogre::String IgnTerrainMatGen::SM2Profile::ShaderHelperGLSL::GetChannel(
2650+
Ogre::String GzTerrainMatGen::SM2Profile::ShaderHelperGLSL::GetChannel(
26512651
Ogre::uint _idx)
26522652
{
26532653
Ogre::uint rem = _idx % 4;

‎ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace gz
4444
{
4545
inline namespace GZ_RENDERING_VERSION_NAMESPACE {
4646
//
47-
/// \addtogroup ign_rendering
47+
/// \addtogroup gz_rendering
4848
/// \{
4949

5050
/// \brief Conversions Conversions.hh rendering/Conversions.hh

0 commit comments

Comments
 (0)