Skip to content

Commit 3f74773

Browse files
author
PopcornFX Bot
committed
UnityPlugin: Release 2.22.0
1 parent a9f24f3 commit 3f74773

File tree

211 files changed

+2713
-9449
lines changed

Some content is hidden

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

211 files changed

+2713
-9449
lines changed

‎Native/PKUnity_FileSystemController.cpp‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ bool CFileStreamFS_Unity::Flush()
178178

179179
void CFileStreamFS_Unity::Close()
180180
{
181-
_InternalCloseIFN();
182181
}
183182

184183
//----------------------------------------------------------------------------
@@ -195,6 +194,26 @@ void CFileStreamFS_Unity::Timestamps(SFileTimes &)
195194
PK_ASSERT_NOT_REACHED();
196195
}
197196

197+
//----------------------------------------------------------------------------
198+
199+
void CFileStreamFS_Unity::_InternalCloseIFN()
200+
{
201+
if (m_Mode == IFileSystem::Access_WriteCreate ||
202+
m_Mode == IFileSystem::Access_ReadWrite ||
203+
m_Mode == IFileSystem::Access_ReadWriteCreate)
204+
{
205+
PK_ONLY_IF_ASSERTS(u64 writtenSize = )::OnResourceWrite(m_Path.Data(), m_PseudoFileHandle, 0, m_Size);
206+
PK_ASSERT(writtenSize == m_Size);
207+
}
208+
if (!PK_VERIFY(::OnResourceUnload(m_Path.Data())))
209+
CLog::Log(PK_ERROR, "OnResourceUnload could not free \'%s\'", m_Path.Data());
210+
if (m_OwnBuffer)
211+
PK_FREE(m_PseudoFileHandle);
212+
m_PseudoFileHandle = null;
213+
m_Cursor = 0;
214+
m_Size = 0;
215+
}
216+
198217
//----------------------------------------------------------------------------
199218
// CUnityPseudoFileSystem
200219
//----------------------------------------------------------------------------
@@ -270,25 +289,5 @@ bool CUnityPseudoFileSystem::DirectoryDelete(const CString &path, bool pathNotVi
270289
return false;
271290
}
272291

273-
//----------------------------------------------------------------------------
274-
275-
void CFileStreamFS_Unity::_InternalCloseIFN()
276-
{
277-
if (m_Mode == IFileSystem::Access_WriteCreate ||
278-
m_Mode == IFileSystem::Access_ReadWrite ||
279-
m_Mode == IFileSystem::Access_ReadWriteCreate)
280-
{
281-
PK_ONLY_IF_ASSERTS(u64 writtenSize = )::OnResourceWrite(m_Path.Data(), m_PseudoFileHandle, 0, m_Size);
282-
PK_ASSERT(writtenSize == m_Size);
283-
}
284-
if (!PK_VERIFY(::OnResourceUnload(m_Path.Data())))
285-
CLog::Log(PK_ERROR, "OnResourceUnload could not free \'%s\'", m_Path.Data());
286-
if (m_OwnBuffer)
287-
PK_FREE(m_PseudoFileHandle);
288-
m_PseudoFileHandle = null;
289-
m_Cursor = 0;
290-
m_Size = 0;
291-
}
292-
293292
//----------------------------------------------------------------------------
294293
__PK_API_END

‎Native/RenderingIntegration/UnityBillboardingBatchPolicy.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,7 @@ bool CUnityBillboardingBatchPolicy::_UpdateThread_IssueDrawCallSound(const Drawe
945945
const u8 enabledTrue = u8(-1);
946946
TStridedMemoryView<const u8> enabledParticles = (bbRequest.m_EnabledStreamId.Valid()) ? page->StreamForReading<bool>(bbRequest.m_EnabledStreamId) : TStridedMemoryView<const u8>(&enabledTrue, pcount, 0);
947947

948+
#if defined(PK_DEBUG)
948949
const u32 posCount = positions.Count();
949950
PK_ASSERT(
950951
posCount == pcount &&
@@ -954,6 +955,7 @@ bool CUnityBillboardingBatchPolicy::_UpdateThread_IssueDrawCallSound(const Drawe
954955
posCount == velocities.Count() &&
955956
posCount == volumes.Count() &&
956957
posCount == radii.Count());
958+
#endif
957959

958960

959961
for (u32 parti = 0; parti < pcount; ++parti)
@@ -971,7 +973,6 @@ bool CUnityBillboardingBatchPolicy::_UpdateThread_IssueDrawCallSound(const Drawe
971973

972974
const float soundId = 0;
973975
const float soundIdFrac = PKFrac(soundId) * isBlended;
974-
const u32 soundId0 = u32(soundId);
975976

976977
PopcornFX::CGuid ldatai = soundDatas.PushBack();
977978

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Unity PopcornFX Plugin
22

33
Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
4-
* **Version:** `v2.21.4`
4+
* **Version:** `v2.22.0`
55
* **Unity:** `2019.4` to `2022.x`
66
* **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`.
77
[Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles.

‎com.persistant-studios.popcornfx.hdrp/Documentation~/popcornfx.hdrp.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Unity PopcornFX Plugin
22
Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
3-
* **Version:** `v2.21.4`
3+
* **Version:** `v2.22.0`
44
* **Unity:** `2019.4` to `2021.x`
55
* **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](http://www.popcornfx.com/contact-us/) for more information.
66

‎com.persistant-studios.popcornfx.hdrp/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Unity PopcornFX Plugin
22

33
Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
4-
* **Version:** `v2.21.4`
4+
* **Version:** `v2.22.0`
55
* **Unity:** `2019.4` to `2022.x`
66
* **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`.
77
[Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles.

‎com.persistant-studios.popcornfx.hdrp/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "com.persistant-studios.popcornfx.hdrp",
33
"description": "HDRP Materials for PopcornFX.",
4-
"version": "2.21.4",
4+
"version": "2.22.0",
55
"unity": "2020.2",
66
"unityRelease": "",
77
"displayName": "PopcornFX HDRP",
88
"dependencies": {
99
"com.unity.render-pipelines.core": "10.2.2",
1010
"com.unity.render-pipelines.high-definition": "10.2.2",
11-
"com.persistant-studios.popcornfx": "2.21.4"
11+
"com.persistant-studios.popcornfx": "2.22.0"
1212
}
1313
}

‎com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Unity PopcornFX Plugin
22
Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
3-
* **Version:** `v2.21.4`
3+
* **Version:** `v2.22.0`
44
* **Unity:** `2017.4` to `2021.x`
55
* **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](http://www.popcornfx.com/contact-us/) for more information.
66

‎com.persistant-studios.popcornfx.urp/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Unity PopcornFX Plugin
22

33
Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
4-
* **Version:** `v2.21.4`
4+
* **Version:** `v2.22.0`
55
* **Unity:** `2019.4` to `2022.x`
66
* **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`.
77
[Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles.

‎com.persistant-studios.popcornfx.urp/Runtime/Scripts/PKFxMaterialFactoryURP.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,11 @@ public override void SetupFallBackFeatureBinding()
166166
m_RenderFeatureBindings.Add(m_TransparentParticleUnlitDefault);
167167
if (m_AdditiveParticleUnlitLegacy != null)
168168
m_RenderFeatureBindings.Add(m_AdditiveParticleUnlitLegacy);
169-
170169
if (m_AlphaBlendDecal != null)
171170
m_RenderFeatureBindings.Add(m_AlphaBlendDecal);
171+
if (m_CPUParticleDistortion != null)
172+
m_RenderFeatureBindings.Add(m_CPUParticleDistortion);
173+
172174
#elif UNITY_2020_3_OR_NEWER
173175
// Meshes:
174176
if (m_TransparentMeshUnlit2020 != null)

‎com.persistant-studios.popcornfx.urp/Runtime/Scripts/PKFxMaterialFactoryURP.cs.meta‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)