27 lines
1.4 KiB
Diff
27 lines
1.4 KiB
Diff
From 2b45d567b05ff5588a7a1625582c5260bbfd67ae Mon Sep 17 00:00:00 2001
|
|
From: Peter Ross <pross@xvid.org>
|
|
Date: Wed, 16 Dec 2020 15:15:40 +1100
|
|
Subject: [PATCH 18/23] BillboardForest:
|
|
s/setMipmapMaxLevel/setNumMipmapLevels/ (OSG 3.7.0)
|
|
|
|
---
|
|
src/Skybolt/SkyboltVis/Renderable/Forest/BillboardForest.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/Skybolt/SkyboltVis/Renderable/Forest/BillboardForest.cpp b/src/Skybolt/SkyboltVis/Renderable/Forest/BillboardForest.cpp
|
|
index 553fa9c..7b2e193 100644
|
|
--- a/src/Skybolt/SkyboltVis/Renderable/Forest/BillboardForest.cpp
|
|
+++ b/src/Skybolt/SkyboltVis/Renderable/Forest/BillboardForest.cpp
|
|
@@ -124,7 +124,7 @@ void BillboardForest::addGeodes(osg::Group& node, const std::vector<Tree>& trees
|
|
ss->setAttributeAndModes(topProgram, osg::StateAttribute::ON);
|
|
static osg::ref_ptr<osg::Texture2D> albedoTexture = new osg::Texture2D(readImageWithCorrectOrientation("Environment/Forest/spruceAtlas_top_albedo.tga"));
|
|
albedoTexture->setInternalFormat(toSrgbInternalFormat(albedoTexture->getInternalFormat()));
|
|
- albedoTexture->setMipmapMaxLevel(4); // TODO: Modify highest mipmap levels so that they maintain alpha, tghen remove this max level
|
|
+ albedoTexture->setNumMipmapLevels(4); // TODO: Modify highest mipmap levels so that they maintain alpha, tghen remove this max level
|
|
ss->setTextureAttributeAndModes(0, albedoTexture, osg::StateAttribute::ON);
|
|
|
|
topGeode->setStateSet(ss);
|
|
--
|
|
2.29.2
|
|
|