From c653c8b38fdc79f61ee191052901ac2012d476b4 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Sun, 5 Jul 2020 22:01:06 -0400 Subject: DeRez Dither Updates (Beam, Dark, NJAD) --- .../Dark/Dark.xcodeproj/christopherjohnson.pbxuser | 80 +++++++++++----------- .../christopherjohnson.perspectivev3 | 38 +++++----- plugins/MacVST/Dark/source/Dark.cpp | 2 +- plugins/MacVST/Dark/source/DarkProc.cpp | 20 ++++-- 4 files changed, 73 insertions(+), 67 deletions(-) (limited to 'plugins/MacVST/Dark') diff --git a/plugins/MacVST/Dark/Dark.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Dark/Dark.xcodeproj/christopherjohnson.pbxuser index ab4e77f..fade19f 100755 --- a/plugins/MacVST/Dark/Dark.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/Dark/Dark.xcodeproj/christopherjohnson.pbxuser @@ -10,7 +10,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 364, + 433, 20, 48, 43, @@ -49,14 +49,14 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 613785687; - PBXWorkspaceStateSaveDate = 613785687; + PBXPerProjectTemplateStateSaveDate = 615684199; + PBXWorkspaceStateSaveDate = 615684199; }; perUserProjectItems = { - 8BD150E724956DDF00B025B9 /* PBXTextBookmark */ = 8BD150E724956DDF00B025B9 /* PBXTextBookmark */; - 8BD150E824956DDF00B025B9 /* PBXTextBookmark */ = 8BD150E824956DDF00B025B9 /* PBXTextBookmark */; - 8BD150EA24956DDF00B025B9 /* PBXTextBookmark */ = 8BD150EA24956DDF00B025B9 /* PBXTextBookmark */; - 8BD151602495A6F400B025B9 /* PBXTextBookmark */ = 8BD151602495A6F400B025B9 /* PBXTextBookmark */; + 8BB07C2224B14991000F894A /* PBXTextBookmark */ = 8BB07C2224B14991000F894A /* PBXTextBookmark */; + 8BB07C8D24B14CB2000F894A /* PBXTextBookmark */ = 8BB07C8D24B14CB2000F894A /* PBXTextBookmark */; + 8BB9A52024B2969B00CD76A8 /* PBXTextBookmark */ = 8BB9A52024B2969B00CD76A8 /* PBXTextBookmark */; + 8BB9A59624B2987700CD76A8 /* PBXTextBookmark */ = 8BB9A59624B2987700CD76A8 /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; userBuildSettings = { @@ -64,18 +64,18 @@ }; 2407DEB6089929BA00EB68BF /* Dark.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {740, 1807}}"; - sepNavSelRange = "{4061, 0}"; - sepNavVisRange = "{1333, 920}"; - sepNavWindowFrame = "{{559, 57}, {895, 821}}"; + sepNavIntBoundsRect = "{{0, 0}, {656, 1768}}"; + sepNavSelRange = "{4121, 231}"; + sepNavVisRange = "{3916, 978}"; + sepNavWindowFrame = "{{545, 57}, {895, 821}}"; }; }; 245463B80991757100464AD3 /* Dark.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {866, 858}}"; - sepNavSelRange = "{2475, 0}"; - sepNavVisRange = "{204, 390}"; - sepNavWindowFrame = "{{545, 57}, {895, 821}}"; + sepNavSelRange = "{2418, 59}"; + sepNavVisRange = "{0, 580}"; + sepNavWindowFrame = "{{888, -91}, {895, 821}}"; }; }; 24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */ = { @@ -88,9 +88,9 @@ }; 24D8286F09A914000093AEF8 /* DarkProc.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {656, 3146}}"; - sepNavSelRange = "{4768, 0}"; - sepNavVisRange = "{4380, 807}"; + sepNavIntBoundsRect = "{{0, 0}, {656, 3107}}"; + sepNavSelRange = "{4793, 117}"; + sepNavVisRange = "{4314, 1529}"; sepNavWindowFrame = "{{531, 57}, {895, 821}}"; }; }; @@ -108,45 +108,45 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8BD150E724956DDF00B025B9 /* PBXTextBookmark */ = { + 8BB07C2224B14991000F894A /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 245463B80991757100464AD3 /* Dark.h */; - name = "Dark.h: 62"; - rLen = 0; - rLoc = 2475; + name = "Dark.h: 58"; + rLen = 59; + rLoc = 2418; rType = 0; - vrLen = 390; - vrLoc = 204; + vrLen = 580; + vrLoc = 0; }; - 8BD150E824956DDF00B025B9 /* PBXTextBookmark */ = { + 8BB07C8D24B14CB2000F894A /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 2407DEB6089929BA00EB68BF /* Dark.cpp */; - name = "Dark.cpp: 110"; - rLen = 0; - rLoc = 4061; + name = "Dark.cpp: 112"; + rLen = 231; + rLoc = 4121; rType = 0; - vrLen = 920; - vrLoc = 1333; + vrLen = 978; + vrLoc = 3916; }; - 8BD150EA24956DDF00B025B9 /* PBXTextBookmark */ = { + 8BB9A52024B2969B00CD76A8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 24D8286F09A914000093AEF8 /* DarkProc.cpp */; - name = "DarkProc.cpp: 143"; + name = "DarkProc.cpp: 227"; rLen = 0; - rLoc = 4770; + rLoc = 7947; rType = 0; - vrLen = 881; - vrLoc = 642; + vrLen = 1334; + vrLoc = 6717; }; - 8BD151602495A6F400B025B9 /* PBXTextBookmark */ = { + 8BB9A59624B2987700CD76A8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 24D8286F09A914000093AEF8 /* DarkProc.cpp */; - name = "DarkProc.cpp: 142"; - rLen = 0; - rLoc = 4768; + name = "DarkProc.cpp: 146"; + rLen = 117; + rLoc = 4793; rType = 0; - vrLen = 807; - vrLoc = 4380; + vrLen = 1529; + vrLoc = 4314; }; 8D01CCC60486CAD60068D4B7 /* Dark */ = { activeExec = 0; diff --git a/plugins/MacVST/Dark/Dark.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Dark/Dark.xcodeproj/christopherjohnson.perspectivev3 index 0626f1d..9acdef6 100755 --- a/plugins/MacVST/Dark/Dark.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/Dark/Dark.xcodeproj/christopherjohnson.perspectivev3 @@ -304,7 +304,7 @@ PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {185, 428}} + {{0, 0}, {185, 695}} PBXTopSmartGroupGIDs @@ -314,14 +314,14 @@ GeometryConfiguration Frame - {{0, 0}, {202, 446}} + {{0, 0}, {202, 713}} GroupTreeTableConfiguration MainColumn 185 RubberWindowFrame - 625 378 810 487 0 0 1440 878 + 493 122 879 754 0 0 1440 878 Module PBXSmartGroupTreeModule @@ -351,12 +351,12 @@ _historyCapacity 0 bookmark - 8BD151602495A6F400B025B9 + 8BB9A59624B2987700CD76A8 history - 8BD150E724956DDF00B025B9 - 8BD150E824956DDF00B025B9 - 8BD150EA24956DDF00B025B9 + 8BB07C2224B14991000F894A + 8BB07C8D24B14CB2000F894A + 8BB9A52024B2969B00CD76A8 SplitCount @@ -370,18 +370,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 334}} + {{0, 0}, {672, 593}} RubberWindowFrame - 625 378 810 487 0 0 1440 878 + 493 122 879 754 0 0 1440 878 Module PBXNavigatorGroup Proportion - 334pt + 593pt Proportion - 107pt + 115pt Tabs @@ -395,9 +395,9 @@ GeometryConfiguration Frame - {{10, 27}, {603, 80}} + {{10, 27}, {672, 88}} RubberWindowFrame - 625 378 810 487 0 0 1440 878 + 493 122 879 754 0 0 1440 878 Module XCDetailModule @@ -460,7 +460,7 @@ Proportion - 603pt + 672pt Name @@ -479,11 +479,11 @@ TableOfContents - 8BD151612495A6F400B025B9 + 8BB9A59724B2987700CD76A8 1CA23ED40692098700951B8B - 8BD151622495A6F400B025B9 + 8BB9A59824B2987700CD76A8 8B0237581D42B1C400E1E8C8 - 8BD151632495A6F400B025B9 + 8BB9A59924B2987700CD76A8 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -636,7 +636,7 @@ StatusbarIsVisible TimeStamp - 613787380.50059402 + 615684215.23886502 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -656,7 +656,7 @@ /Users/christopherjohnson/Desktop/Dithers/MacVST/Dark/Dark.xcodeproj WindowString - 625 378 810 487 0 0 1440 878 + 493 122 879 754 0 0 1440 878 WindowToolsV3 diff --git a/plugins/MacVST/Dark/source/Dark.cpp b/plugins/MacVST/Dark/source/Dark.cpp index bae0428..f652aa4 100755 --- a/plugins/MacVST/Dark/source/Dark.cpp +++ b/plugins/MacVST/Dark/source/Dark.cpp @@ -14,11 +14,11 @@ Dark::Dark(audioMasterCallback audioMaster) : { A = 1.0; B = 0.0; + fpd = 17; for(int count = 0; count < 99; count++) { lastSampleL[count] = 0; lastSampleR[count] = 0; } - fpd = 17; //this is reset: values being initialized only once. Startup values, whatever they are. _canDo.insert("plugAsChannelInsert"); // plug-in can be used as a channel insert effect. diff --git a/plugins/MacVST/Dark/source/DarkProc.cpp b/plugins/MacVST/Dark/source/DarkProc.cpp index 2aa85c4..955a53f 100755 --- a/plugins/MacVST/Dark/source/DarkProc.cpp +++ b/plugins/MacVST/Dark/source/DarkProc.cpp @@ -13,13 +13,14 @@ void Dark::processReplacing(float **inputs, float **outputs, VstInt32 sampleFram float* in2 = inputs[1]; float* out1 = outputs[0]; float* out2 = outputs[1]; - int processing = (VstInt32)( A * 1.999 ); double overallscale = 1.0; overallscale /= 44100.0; overallscale *= getSampleRate(); int depth = (int)(17.0*overallscale); if (depth < 3) depth = 3; if (depth > 98) depth = 98; + + int processing = (VstInt32)( A * 1.999 ); bool highres = false; if (processing == 1) highres = true; float scaleFactor; @@ -28,6 +29,8 @@ void Dark::processReplacing(float **inputs, float **outputs, VstInt32 sampleFram float derez = B; if (derez > 0.0) scaleFactor *= pow(1.0-derez,6); if (scaleFactor < 0.0001) scaleFactor = 0.0001; + float outScale = scaleFactor; + if (outScale < 8.0) outScale = 8.0; while (--sampleFrames >= 0) { @@ -105,8 +108,8 @@ void Dark::processReplacing(float **inputs, float **outputs, VstInt32 sampleFram lastSampleR[0] = inputSampleR; //end right - inputSampleL /= scaleFactor; - inputSampleR /= scaleFactor; + inputSampleL /= outScale; + inputSampleR /= outScale; *out1 = inputSampleL; *out2 = inputSampleR; @@ -125,13 +128,14 @@ void Dark::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sa double* out1 = outputs[0]; double* out2 = outputs[1]; - int processing = (VstInt32)( A * 1.999 ); double overallscale = 1.0; overallscale /= 44100.0; overallscale *= getSampleRate(); int depth = (int)(17.0*overallscale); if (depth < 3) depth = 3; if (depth > 98) depth = 98; + + int processing = (VstInt32)( A * 1.999 ); bool highres = false; if (processing == 1) highres = true; float scaleFactor; @@ -139,7 +143,9 @@ void Dark::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sa else scaleFactor = 32768.0; float derez = B; if (derez > 0.0) scaleFactor *= pow(1.0-derez,6); - if (scaleFactor < 1.0) scaleFactor = 1.0; + if (scaleFactor < 0.0001) scaleFactor = 0.0001; + float outScale = scaleFactor; + if (outScale < 8.0) outScale = 8.0; while (--sampleFrames >= 0) { @@ -217,8 +223,8 @@ void Dark::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sa lastSampleR[0] = inputSampleR; //end right - inputSampleL /= scaleFactor; - inputSampleR /= scaleFactor; + inputSampleL /= outScale; + inputSampleR /= outScale; *out1 = inputSampleL; *out2 = inputSampleR; -- cgit v1.2.3