diff --git a/Assets/FastIK/Scripts/FastIK/FastIKFabric.cs b/Assets/FastIK/Scripts/FastIK/FastIKFabric.cs index a9f6ee1..c4f34ed 100644 --- a/Assets/FastIK/Scripts/FastIK/FastIKFabric.cs +++ b/Assets/FastIK/Scripts/FastIK/FastIKFabric.cs @@ -230,10 +230,10 @@ namespace DitzelGames.FastIK else current.rotation = Root.rotation * rotation; } +#if UNITY_EDITOR void OnDrawGizmos() { -#if UNITY_EDITOR var current = this.transform; for (int i = 0; i < ChainLength && current != null && current.parent != null; i++) { diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta new file mode 100644 index 0000000..11ef649 --- /dev/null +++ b/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 947397321da17394383d0a5841579caf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Master.bank b/Assets/StreamingAssets/Master.bank new file mode 100644 index 0000000..667b8e1 Binary files /dev/null and b/Assets/StreamingAssets/Master.bank differ diff --git a/Assets/StreamingAssets/Master.bank.meta b/Assets/StreamingAssets/Master.bank.meta new file mode 100644 index 0000000..bbdd199 --- /dev/null +++ b/Assets/StreamingAssets/Master.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 23ef3cba2820b6c4492b064f63e5da7f +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Master.strings.bank b/Assets/StreamingAssets/Master.strings.bank new file mode 100644 index 0000000..1736a99 Binary files /dev/null and b/Assets/StreamingAssets/Master.strings.bank differ diff --git a/Assets/StreamingAssets/Master.strings.bank.meta b/Assets/StreamingAssets/Master.strings.bank.meta new file mode 100644 index 0000000..21498e4 --- /dev/null +++ b/Assets/StreamingAssets/Master.strings.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 8ca61220d58d4c3448dfe43a91d476a8 +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/models/bananPeal.blend b/Assets/models/bananPeal.blend index 928c8a9..2d8975a 100644 --- a/Assets/models/bananPeal.blend +++ b/Assets/models/bananPeal.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4081f37acc26097a8ed3c2905a7b8dd20607c5f6d9e2268bda60509f26f886e5 -size 879992 +oid sha256:eb523194fd23340501fd40846880c6774940b05b5b59df4c129696ced55349ce +size 903252 diff --git a/Assets/models/bananPeal.blend1 b/Assets/models/bananPeal.blend1 index a3867ae..037d631 100644 Binary files a/Assets/models/bananPeal.blend1 and b/Assets/models/bananPeal.blend1 differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 60c6252..b04a996 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -128,7 +128,8 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.1 - preloadedAssets: [] + preloadedAssets: + - {fileID: 11400000, guid: ad76045632be0b24da9b262655368913, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/fmod_editor.log b/fmod_editor.log index cbaaba4..2558458 100644 --- a/fmod_editor.log +++ b/fmod_editor.log @@ -7,7 +7,7 @@ [LOG] OutputWASAPI::init : Output buffer size: 4096 samples, latency: 0.00ms, period: 10.00ms, DSP buffer: 1024 * 4 [LOG] Thread::initThread : Init FMOD stream thread. Affinity: 0x8000000000000003, Priority: 0xFFFF7FFB, Stack Size: 98304, Semaphore: No, Sleep Time: 10, Looping: Yes. [LOG] Thread::initThread : Init FMOD mixer thread. Affinity: 0x8000000000000001, Priority: 0xFFFF7FFA, Stack Size: 81920, Semaphore: No, Sleep Time: 0, Looping: Yes. -[LOG] AsyncManager::init : manager 000001D3F769A988 isAsync 0 updatePeriod 0.02 +[LOG] AsyncManager::init : manager 000001D51720A658 isAsync 0 updatePeriod 0.02 [LOG] AsyncManager::init : done [LOG] PlaybackSystem::init : [LOG] Thread::initThread : Init FMOD Studio sample load thread. Affinity: 0x8000000000000003, Priority: 0xFFFF7FFD, Stack Size: 98304, Semaphore: No, Sleep Time: 1, Looping: No. @@ -18,85 +18,3 @@ [LOG] Manager::readBank : fileversion = 135, compatVersion = 132 (oldest = 44, newest = 135) [LOG] Manager::readBank : fileversion = 135, compatVersion = 132 (oldest = 44, newest = 135) [LOG] PlaybackSystem::acquireMasterBus : Setting master channel group format to 6 -[LOG] SystemI::createSoundInternal : Create name='', mode=0x02000202 -[LOG] SystemI::createSoundInternal : exinfo->cbsize = 224 -[LOG] SystemI::createSoundInternal : exinfo->length = 15936 -[LOG] SystemI::createSoundInternal : exinfo->fileoffset = 3104 -[LOG] SystemI::createSoundInternal : exinfo->numsubsounds = 1 -[LOG] SystemI::createSoundInternal : exinfo->inclusionlist = 0000008B9FFFF108 -[LOG] SystemI::createSoundInternal : exinfo->inclusionlistnum = 1 -[LOG] SystemI::createSoundInternal : exinfo->suggestedsoundtype = 5 -[LOG] SystemI::createSoundInternal : exinfo->useropen = 00007FF909F760E0 -[LOG] SystemI::createSoundInternal : exinfo->userclose = 00007FF909F760B0 -[LOG] SystemI::createSoundInternal : exinfo->userread = 00007FF909F761B0 -[LOG] SystemI::createSoundInternal : exinfo->userseek = 00007FF909F76270 -[LOG] SystemI::createSoundInternal : exinfo->fileuserdata = 000001D41F85F348 -[LOG] SystemI::createSoundInternal : exinfo->initialseekpostype = 1 -[LOG] SystemI::DSPCodecPoolRegister : register codec pool for pool type 5 -[LOG] SystemI::createSoundInternal : Sample 0/1: name='DobberFootStep03', format=5, channels=2, frequency=48000, lengthbytes=4448, lengthpcm=22569, pcmblocksize=0, loopstart=0, loopend=0, mode=0x00000000, channelmask=0x00000000, channelorder=0, peakvolume=0.202423. -[LOG] SystemI::createSoundInternal : Create name='', mode=0x02000202 -[LOG] SystemI::createSoundInternal : exinfo->cbsize = 224 -[LOG] SystemI::createSoundInternal : exinfo->length = 15936 -[LOG] SystemI::createSoundInternal : exinfo->fileoffset = 3104 -[LOG] SystemI::createSoundInternal : exinfo->numsubsounds = 1 -[LOG] SystemI::createSoundInternal : exinfo->inclusionlist = 0000008B9FFFF108 -[LOG] SystemI::createSoundInternal : exinfo->inclusionlistnum = 1 -[LOG] SystemI::createSoundInternal : exinfo->suggestedsoundtype = 5 -[LOG] SystemI::createSoundInternal : exinfo->useropen = 00007FF909F760E0 -[LOG] SystemI::createSoundInternal : exinfo->userclose = 00007FF909F760B0 -[LOG] SystemI::createSoundInternal : exinfo->userread = 00007FF909F761B0 -[LOG] SystemI::createSoundInternal : exinfo->userseek = 00007FF909F76270 -[LOG] SystemI::createSoundInternal : exinfo->fileuserdata = 000001D41F85F348 -[LOG] SystemI::createSoundInternal : exinfo->initialseekpostype = 1 -[LOG] SystemI::DSPCodecPoolRegister : register codec pool for pool type 5 -[LOG] SystemI::createSoundInternal : Sample 0/1: name='DobberFootStep02', format=5, channels=2, frequency=48000, lengthbytes=3968, lengthpcm=20062, pcmblocksize=0, loopstart=0, loopend=0, mode=0x00000000, channelmask=0x00000000, channelorder=0, peakvolume=0.067535. -[LOG] SystemI::createSoundInternal : Create name='', mode=0x02000202 -[LOG] SystemI::createSoundInternal : exinfo->cbsize = 224 -[LOG] SystemI::createSoundInternal : exinfo->length = 15936 -[LOG] SystemI::createSoundInternal : exinfo->fileoffset = 3104 -[LOG] SystemI::createSoundInternal : exinfo->numsubsounds = 1 -[LOG] SystemI::createSoundInternal : exinfo->inclusionlist = 0000008B9FFFF108 -[LOG] SystemI::createSoundInternal : exinfo->inclusionlistnum = 1 -[LOG] SystemI::createSoundInternal : exinfo->suggestedsoundtype = 5 -[LOG] SystemI::createSoundInternal : exinfo->useropen = 00007FF909F760E0 -[LOG] SystemI::createSoundInternal : exinfo->userclose = 00007FF909F760B0 -[LOG] SystemI::createSoundInternal : exinfo->userread = 00007FF909F761B0 -[LOG] SystemI::createSoundInternal : exinfo->userseek = 00007FF909F76270 -[LOG] SystemI::createSoundInternal : exinfo->fileuserdata = 000001D41F85F348 -[LOG] SystemI::createSoundInternal : exinfo->initialseekpostype = 1 -[LOG] SystemI::DSPCodecPoolRegister : register codec pool for pool type 5 -[LOG] SystemI::createSoundInternal : Sample 0/1: name='DobberFootStep01', format=5, channels=2, frequency=48000, lengthbytes=4448, lengthpcm=21315, pcmblocksize=0, loopstart=0, loopend=0, mode=0x00000000, channelmask=0x00000000, channelorder=0, peakvolume=0.058441. -[LOG] SystemI::createSoundInternal : Create name='', mode=0x02000202 -[LOG] SystemI::createSoundInternal : exinfo->cbsize = 224 -[LOG] SystemI::createSoundInternal : exinfo->length = 15936 -[LOG] SystemI::createSoundInternal : exinfo->fileoffset = 3104 -[LOG] SystemI::createSoundInternal : exinfo->numsubsounds = 1 -[LOG] SystemI::createSoundInternal : exinfo->inclusionlist = 0000008B9FFFF108 -[LOG] SystemI::createSoundInternal : exinfo->inclusionlistnum = 1 -[LOG] SystemI::createSoundInternal : exinfo->suggestedsoundtype = 5 -[LOG] SystemI::createSoundInternal : exinfo->useropen = 00007FF909F760E0 -[LOG] SystemI::createSoundInternal : exinfo->userclose = 00007FF909F760B0 -[LOG] SystemI::createSoundInternal : exinfo->userread = 00007FF909F761B0 -[LOG] SystemI::createSoundInternal : exinfo->userseek = 00007FF909F76270 -[LOG] SystemI::createSoundInternal : exinfo->fileuserdata = 000001D41F85F348 -[LOG] SystemI::createSoundInternal : exinfo->initialseekpostype = 1 -[LOG] SystemI::DSPCodecPoolRegister : register codec pool for pool type 5 -[LOG] SystemI::createSoundInternal : Sample 0/1: name='DobberFootStep04', format=5, channels=2, frequency=48000, lengthbytes=2816, lengthpcm=13792, pcmblocksize=0, loopstart=0, loopend=0, mode=0x00000000, channelmask=0x00000000, channelorder=0, peakvolume=0.099457. -[LOG] SoundI::release : (000001D4F8EF1A28) -[LOG] SoundI::release : DobberFootStep03 (000001D4AFC5AFC8) -[LOG] SoundI::release : (000001D4F8EF5238) -[LOG] SoundI::release : DobberFootStep02 (000001D4AFC59908) -[LOG] SoundI::release : (000001D4F8EF46B8) -[LOG] SoundI::release : DobberFootStep01 (000001D4AFC58DA8) -[LOG] SoundI::release : (000001D4F8EF6938) -[LOG] SoundI::release : DobberFootStep04 (000001D4AFC5AAE8) -[LOG] Thread::callback : FMOD Studio update thread finished. -[LOG] Thread::callback : FMOD Studio bank load thread finished. -[LOG] Profile::disconnectAll : Profiler disconnecting all clients -[LOG] Thread::callback : FMOD Studio sample load thread finished. -[LOG] LiveUpdate::release : -[LOG] LiveUpdate::reset : Reset connection (reason Disconnected) -[LOG] Thread::callback : FMOD stream thread finished. -[LOG] Thread::callback : FMOD mixer thread finished. -[LOG] Profile::disconnectAll : Profiler disconnecting all clients -[LOG] SystemI::close : Closed.