mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 10:53:53 +00:00
Code Issues Releases Wiki Activity

Merge branch 'partcolor' into 'master'

Browse source 
Use NiParticleSystemController's color for the initially set particle color

See merge request OpenMW/openmw!2234
This commit is contained in:
psi29a 2022-08-03 13:34:17 +00:00
commit 49a15f72da
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/nif/controller.cpp
View file

@ -40,7 +40,7 @@ namespace Nif
horizontalDir = nif->getFloat(); horizontalDir = nif->getFloat();
horizontalAngle = nif->getFloat(); horizontalAngle = nif->getFloat();
/*normal?*/ nif->getVector3(); /*normal?*/ nif->getVector3();
/*color?*/ nif->getVector4(); color = nif->getVector4();
size = nif->getFloat(); size = nif->getFloat();
startTime = nif->getFloat(); startTime = nif->getFloat();
stopTime = nif->getFloat(); stopTime = nif->getFloat();

1
components/nif/controller.hpp
View file

@ -52,6 +52,7 @@ struct NiParticleSystemController : public Controller
float horizontalDir; float horizontalDir;
float horizontalAngle; float horizontalAngle;
osg::Vec4f color;
float size; float size;
float startTime; float startTime;
float stopTime; float stopTime;

7
components/nifosg/nifloader.cpp
View file

@ -1050,9 +1050,8 @@ namespace NifOsg
const osg::Vec3f& position = particledata->vertices[particle.vertex]; const osg::Vec3f& position = particledata->vertices[particle.vertex];
created->setPosition(position); created->setPosition(position);
osg::Vec4f partcolor (1.f,1.f,1.f,1.f); created->setColorRange(osgParticle::rangev4(partctrl->color, partctrl->color));
if (particle.vertex < particledata->colors.size()) created->setAlphaRange(osgParticle::rangef(1.f, 1.f));
partcolor = particledata->colors[particle.vertex];
float size = partctrl->size; float size = partctrl->size;
if (particle.vertex < particledata->sizes.size()) if (particle.vertex < particledata->sizes.size())
@ -1171,7 +1170,7 @@ namespace NifOsg
handleParticleInitialState(nifNode, partsys, partctrl); handleParticleInitialState(nifNode, partsys, partctrl);
partsys->getDefaultParticleTemplate().setSizeRange(osgParticle::rangef(partctrl->size, partctrl->size)); partsys->getDefaultParticleTemplate().setSizeRange(osgParticle::rangef(partctrl->size, partctrl->size));
partsys->getDefaultParticleTemplate().setColorRange(osgParticle::rangev4(osg::Vec4f(1.f,1.f,1.f,1.f), osg::Vec4f(1.f,1.f,1.f,1.f))); partsys->getDefaultParticleTemplate().setColorRange(osgParticle::rangev4(partctrl->color, partctrl->color));
partsys->getDefaultParticleTemplate().setAlphaRange(osgParticle::rangef(1.f, 1.f)); partsys->getDefaultParticleTemplate().setAlphaRange(osgParticle::rangef(1.f, 1.f));
if (!partctrl->emitter.empty()) if (!partctrl->emitter.empty())