Quellcode durchsuchen

Additive blending for type 3

myst6re vor 11 Jahren
Ursprung
Commit
f082758aa6

+ 1 - 5
utilities/ffvii_field_dat_dumper/src/DatFile.cpp

@@ -3336,7 +3336,7 @@ DatFile::AddTile( const Tile& tile, MimFile& mim, Logger* export_text )
     {
     {
         blending_str = "alpha";
         blending_str = "alpha";
     }
     }
-    else if( tile.blending == 1 )
+    else if( tile.blending == 1 || tile.blending == 3 ) // 3 is source + 0.25 * destination
     {
     {
         blending_str = "add";
         blending_str = "add";
     }
     }
@@ -3344,10 +3344,6 @@ DatFile::AddTile( const Tile& tile, MimFile& mim, Logger* export_text )
     {
     {
         blending_str = "subtract";
         blending_str = "subtract";
     }
     }
-    // else if( tile.blending == 3 )
-    // {
-    //     blending_str = "add"; // source + 0.25 * destination
-    // }
     else
     else
     {
     {
         LOGGER->Log( "Tile blending with type \"" + Ogre::StringConverter::toString( tile.blending ) + "\" not supported." );
         LOGGER->Log( "Tile blending with type \"" + Ogre::StringConverter::toString( tile.blending ) + "\" not supported." );

+ 1 - 1
utilities/q-gears-launcher/src/ff7DataInstaller.cpp

@@ -289,7 +289,7 @@ static void FF7PcFieldToQGearsField(QGears::FLevelFilePtr& field, const std::str
                     {
                     {
                         blending_str = "alpha";
                         blending_str = "alpha";
                     }
                     }
-                    else if (sprite.blending == 1)
+                    else if (sprite.blending == 1 || sprite.blending == 3) // 3 is source + 0.25 * destination
                     {
                     {
                         blending_str = "add";
                         blending_str = "add";
                     }
                     }