PopcornFX Plugin v2.20.0

.github/workflows/draft-release.yml

@@ -21,4 +21,4 @@ jobs:
           name: "After Effects Plugin: ${{ github.ref_name }}"
           body: "PopcornFX Plugin ${{ github.ref_name }} for After Effects\n\n
                 You can download the PopcornFX Editor and find the full changelog here:\n
-                https://wiki.popcornfx.com/index.php?title=PK-Editor_${{ env.MINOR_VERSION }}#Changelog_${{ env.VERSION }}"
+                https://wiki.popcornfx.com/index.php?title=PK-Editor_${{ env.SHORT }}#Changelog_${{ env.MINOR_VERSION }}"

AE_GeneralPlugin/Include/AEGP_AssetBaker.h

@@ -182,7 +182,7 @@ class	CEffectBaker : public CRefCountedObject
 	void				CancelAllFileChanges();
 	int					PopFileChanges();
 	bool				IsChangeRegistered(const CString &path, EAssetChangesType type);
-	void				ReimportAssets(TArray<CString> &paths, bool importPkri = true);
+	void				ReimportAssets(TArray<CString> &paths);
 	void				ReimportAllAssets(bool refesh);
 	void				GetAllAssetPath();
 	const CString		&GetSourcePackRootPath() const { return m_RootDir; }

AE_GeneralPlugin/Include/AEGP_PopcornFXPlugins.h

@@ -22,6 +22,7 @@ enum	ERuntimePlugin
 	EPlugin_ImageCodecPVR			= 1 << 6,
 	EPlugin_ImageCodecHDR			= 1 << 7,
 	EPlugin_ImageCodecEXR			= 1 << 8,
+	EPlugin_ImageCodecPKIM			= 1 << 9,
 
 	EPlugin_MeshCodecFBX			= 1 << 16,
 	EPlugin_MeshCodecGranny			= 1 << 17,
@@ -34,6 +35,7 @@ enum	ERuntimePlugin
 	// All "base" plugins
 	EPlugin_Default	=	EPlugin_CompilerBackendVM |
 						EPlugin_CompilerBackendD3D |
+						EPlugin_ImageCodecPKIM |
 						EPlugin_ImageCodecDDS |
 						EPlugin_ImageCodecPNG |
 						EPlugin_ImageCodecJPG |

AE_GeneralPlugin/Include/AEGP_Scene.h

@@ -9,7 +9,6 @@
 #include "AEGP_Define.h"
 
 #include "AEGP_RenderContext.h"
-#include "AEGP_FrameCollector.h"
 
 #include <pk_base_object/include/hbo_object.h>
 
@@ -159,6 +158,9 @@ class	CAAEScene : public CRefCountedObject
 
 	void									SetSeeking(bool seekingEnabled) { m_SeekingEnabled = seekingEnabled; }
 	void									SetSkinnedBackdropParams(bool enabled, bool weightedSampling,  u32 colorStreamID, u32 weightStreamID);
+	//	RenderHelpers integration
+	PKSample::CRendererBatchDrawer			*NewBatchDrawer(ERendererClass rendererType, const PRendererCacheBase &rendererCache, bool gpuStorage);
+	PRendererCacheBase						NewRendererCache(const PRendererDataBase &renderer, const CParticleDescriptor *particleDesc);
 
 protected:
 	bool									_LateInitializeIFN();

AE_GeneralPlugin/Sources/AEGP_AssetBaker.cpp

@@ -185,6 +185,7 @@ SBakeContext::~SBakeContext()
 	COvenBakeConfig_VectorField::UnregisterHandler();
 	COvenBakeConfig_TextureAtlas::UnregisterHandler();
 	COvenBakeConfig_Texture::UnregisterHandler();
+	COvenBakeConfig_TextureLookup::UnregisterHandler();
 	COvenBakeConfig_Mesh::UnregisterHandler();
 	COvenBakeConfig_HBO::UnregisterHandler();
 	COvenBakeConfig_Base::UnregisterHandler();
@@ -238,6 +239,7 @@ bool	SBakeContext::Init()
 	COvenBakeConfig_Base::RegisterHandler();
 	COvenBakeConfig_HBO::RegisterHandler();
 	COvenBakeConfig_Mesh::RegisterHandler();
+	COvenBakeConfig_TextureLookup::RegisterHandler();
 	COvenBakeConfig_Texture::RegisterHandler();
 	COvenBakeConfig_TextureAtlas::RegisterHandler();
 	COvenBakeConfig_VectorField::RegisterHandler();
@@ -436,7 +438,7 @@ void	CEffectBaker::Initialize(const CString &srcPack, const CString &dstPack, co
 		const CGuid	ovenIdTexture = m_Cookery.RegisterOven(PK_NEW(COven_Texture));
 		const CGuid	ovenIdTextureAtlas = m_Cookery.RegisterOven(PK_NEW(COven_TextureAtlas));
 		const CGuid	ovenIdVectorField = m_Cookery.RegisterOven(PK_NEW(COven_VectorField));
-
+		const CGuid	ovenIdMaterial = m_Cookery.RegisterOven(PK_NEW(COven_Material));
 		COven_Particle	*ovenParticle = PK_NEW(COven_Particle);
 		ovenParticle->SetExternalPathRemapper(FastDelegate<bool(CString &)>(SBakeContext::_RemapPath));
 		const CGuid	ovenIdParticle = m_Cookery.RegisterOven(ovenParticle);
@@ -446,17 +448,18 @@ void	CEffectBaker::Initialize(const CString &srcPack, const CString &dstPack, co
 
 		if (!ovenIdHBO.Valid() || !ovenIdMesh.Valid() || !ovenIdTexture.Valid() || !ovenIdTextureAtlas.Valid() ||
 			!ovenIdVectorField.Valid() || !ovenIdParticle.Valid() || !ovenIdStraightCopy.Valid() ||
-			!ovenIdAudio.Valid())
+			!ovenIdAudio.Valid() || !ovenIdMaterial.Valid())
 		{
 			CLog::Log(PK_WARN, "Couldn't initialize the cookery, RegisterOven Failed.");
 			return;
 		}
 
 		m_Cookery.MapOven("pkri", ovenIdStraightCopy);		// Editor Material
-		m_Cookery.MapOven("pkma", ovenIdStraightCopy);		// Editor Material
+		m_Cookery.MapOven("pkma", ovenIdMaterial);			// Editor Material to report the .pkri used by the effects
 		// map all known extensions to the appropriate oven:
 		m_Cookery.MapOven("fbx", ovenIdMesh);				// FBX mesh
 		m_Cookery.MapOven("pkmm", ovenIdMesh);				// PopcornFX multi-mesh
+		m_Cookery.MapOven("pkim", ovenIdTexture);			// pkim image
 		m_Cookery.MapOven("dds", ovenIdTexture);			// dds image
 		m_Cookery.MapOven("png", ovenIdTexture);			// png image
 		m_Cookery.MapOven("jpg", ovenIdTexture);			// jpg image
@@ -603,14 +606,12 @@ bool	CEffectBaker::IsChangeRegistered(const CString &path, EAssetChangesType typ
 
 //----------------------------------------------------------------------------
 
-void	CEffectBaker::ReimportAssets(TArray<CString> &paths, bool importPkri /*=true*/)
+void	CEffectBaker::ReimportAssets(TArray<CString> &paths)
 {
 	for (u32 i = 0; i < paths.Count(); ++i)
 	{
 		FileChangedRelativePath(paths[i]);
 	}
-	if (importPkri)
-		FileChangedRelativePath(m_LibraryDir + "/PopcornFXCore/Materials/Interface/Editor.pkri");
 }
 
 //----------------------------------------------------------------------------

AE_GeneralPlugin/Sources/AEGP_PopcornFXPlugins.cpp

@@ -31,6 +31,7 @@ PK_PLUGIN_DECLARE(CCompilerBackendGPU_D3D);
 
 
 #	if defined(USE_IMAGE_PLUGINS)
+PK_PLUGIN_DECLARE(CImagePKIMCodec);
 PK_PLUGIN_DECLARE(CImageDDSCodec);
 PK_PLUGIN_DECLARE(CImagePNGCodec);
 PK_PLUGIN_DECLARE(CImageTGACodec);
@@ -100,6 +101,13 @@ bool	PopcornRegisterPlugins(u32 selected /*= 0*/)
 	}
 #	endif
 #	ifdef USE_IMAGE_PLUGINS
+	if (selected & EPlugin_ImageCodecPKIM)
+	{
+		const char		*codecPathPKIM = "Plugins/image_codec_pkim" PK_PLUGIN_POSTFIX_BUILD PK_PLUGIN_POSTFIX_EXT;
+		IPluginModule	*codecPKIM = StartupPlugin_CImagePKIMCodec();
+		success &= (codecPKIM != null && PopcornFX::CPluginManager::PluginRegister(codecPKIM, true, codecPathPKIM));
+	}
+
 	if (selected & EPlugin_ImageCodecDDS)
 	{
 		const char		*codecPathDDS = "Plugins/image_codec_dds" PK_PLUGIN_POSTFIX_BUILD PK_PLUGIN_POSTFIX_EXT;
@@ -203,6 +211,13 @@ void		PopcornUnregisterPlugins()
 	}
 #	endif
 #	ifdef USE_IMAGE_PLUGINS
+	if (g_LoadedPlugins & EPlugin_ImageCodecPKIM)
+	{
+		IPluginModule		*codecPKIM = GetPlugin_CImagePKIMCodec();
+		(codecPKIM != null && PopcornFX::CPluginManager::PluginRelease(codecPKIM));
+		ShutdownPlugin_CImagePKIMCodec();
+	}
+
 	if (g_LoadedPlugins & EPlugin_ImageCodecDDS)
 	{
 		IPluginModule		*codecDDS = GetPlugin_CImageDDSCodec();