-
Notifications
You must be signed in to change notification settings - Fork 123
Update channel limits and VBAP 1.0.3.2 #376
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
Thanks @muellmusik |
@muellmusik are you planning to make the requested changes or do you suggest pulling this in as is? |
Sorry @dyfer, I somehow didn't see these.
Could you be more specific as to what you want me to do? The code is mostly from old PD code and is a big mix of tabs and spaces. I can change line 288 and 290 to be one or the other if that's what you mean, but it won't make things consistent so I'm not sure what's best. Also which formatting would you like changed?
I'm okay with that personally. It's a little awkward at the moment as I changed machines and haven't managed to set up a build chain yet (Apple dev license woes...) but I can make changes if need. My personal view is that strict standards for formatting have been dispiriting for some new contributors, and thus aren't really worth it, though I know others have differing views. |
source/VBAPUGens/sc/vbap.sc
Outdated
}, {table_size = table_size - 1;}); | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace
source/VBAPUGens/sc/vbap.sc
Outdated
//"triplet_amount before stripping: %\n".postf(sets.size); | ||
sets = sets.reject({|set| | ||
i1 = set.chanOffsets[0]; | ||
i1 = set.chanOffsets[0]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace
source/VBAPUGens/sc/vbap.sc
Outdated
+ abs(this.vec_angle(speakers[i], speakers[k])) | ||
+ abs(this.vec_angle(speakers[j], speakers[k]))); | ||
+ abs(this.vec_angle(speakers[i], speakers[k])) | ||
+ abs(this.vec_angle(speakers[j], speakers[k]))); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace
source/VBAPUGens/sc/vbap.sc
Outdated
var length, result; | ||
result = VBAPSpeaker.new; | ||
result.x = (v1.y * v2.z ) - (v1.z * v2.y); | ||
result.y = (v1.z * v2.x ) - (v1.x * v2.z); | ||
var length, result; | ||
result = VBAPSpeaker.new; | ||
result.x = (v1.y * v2.z ) - (v1.z * v2.y); | ||
result.y = (v1.z * v2.x ) - (v1.x * v2.z); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace
source/VBAPUGens/sc/vbap.sc
Outdated
(this.vec_length(v1) * this.vec_length(v2)); | ||
var inner; | ||
inner = ((v1.x*v2.x) + (v1.y*v2.y) + (v1.z*v2.z)) / | ||
(this.vec_length(v1) * this.vec_length(v2)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace
source/VBAPUGens/sc/vbap.sc
Outdated
triplet_amount = sets.size; | ||
//"triplet_amount: %\n".postf(triplet_amount); | ||
triplet_amount = sets.size; | ||
//"triplet_amount: %\n".postf(triplet_amount); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace
source/VBAPUGens/sc/vbap.sc
Outdated
lp1 = speakers[set.chanOffsets[0]]; | ||
lp1 = speakers[set.chanOffsets[0]]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace
source/VBAPUGens/sc/vbap.sc
Outdated
^super.newCopyArgs(chanOffsets); | ||
} | ||
^super.newCopyArgs(chanOffsets); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace
source/VBAPUGens/VBAP.cpp
Outdated
} | ||
} | ||
} | ||
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace
source/VBAPUGens/VBAP.cpp
Outdated
final_gs[i]=0.f; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace (end of the first line and and beginning of the second line)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If going back to fix white space, I might also recommend clearing out unused variables, which in a few places look to have simply been commented out.
@dyfer No worries, I'll fix it thanks for marking. I hope this didn't come off as 'heated' in any way. :-) |
0503638
to
256b6b9
Compare
Okay @dyfer. I think that's all fixed now. Let me know if there's something more needed. Sorry it took so long. |
256b6b9
to
63fd757
Compare
Oh and removed commented out vars, @mtmccrea |
Thanks @muellmusik |
Adjustments ported from new PD code. LS amounts allocated dynamically. VBAP 1.0.3.2 Remove ls hardcoded limit Signed-off-by: Scott Wilson <[email protected]>
63fd757
to
157f2d8
Compare
Done |
https://github.com/supercollider/sc3-plugins/blob/topic/vbap-improvements/source/VBAPUGens/sc/HelpSource/Classes/VBAPSpeaker.schelp#L11 EDIT: I guess I should've been specific and write "in multiple files". If you don't think it's worth changing these, please let me know. |
Adjustments ported from new PD code for VBAP 1.0.3.2. LS amounts allocated dynamically.