avm2: Make PerspectiveProjection.focalLength more precise #19748
+1,216
−1,222
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cookie-s
force-pushed
the
avm2-pp-focallength-precise
branch
3 times, most recently
from
ebd8291 to
5daa9d6
Compare
The previous calculation for focalLength was correct in semantics, but the difference from FP was not tiny. The calculation involves trigonometric functions in floating point number and this semantically-equivalent refactoring makes the result of focalLength calculation closer to that of FP.
Move approximation logic from ActionScript to Ruffle test framework
cookie-s
commented
Mar 8, 2025
| @@ -40,7 +40,7 @@ pub fn get_focal_length<'gc>( | |||
| let fov = this.get_slot(pp_slots::FOV).coerce_to_number(activation)?; | |||
|
|
|||
| let width = get_width(activation, this); | |||
| let focal_length = (width / 2.0) / f64::tan(fov / 2.0 * DEG2RAD); | |||
| let focal_length = (width / 2.0) as f32 * f64::tan((PI - fov * DEG2RAD) / 2.0) as f32; | |||
There was a problem hiding this comment.
After many trials and observations, I found this code. It doesn't seem to be perfect yet (for edge values like 1e-10), though.
1 / tan x=cot x=tan (pi/2 - x)_ as f32 * f32::tan(_)is not good. This produces better result.
Comment on lines
+6
to
+7
| 'fieldOfView = ([0-9.]+)', | ||
| 'FOV [0-9]+ ([0-9.]+)', |
There was a problem hiding this comment.
field of view still has some errors.
var pp: PerspectiveProjection = new PerspectiveProjection();
pp.fieldOfView = 179.99999;
trace(pp.fieldOfView);
I found the code above gives 179.99999000000003, so even pp.fieldOfView is not a simple storage variable.
Lord-McSweeney
added
A-avm2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Small follow up to #19532
The previous
focalLengthgetter had a certain level of difference. This change reduces the difference from Flash Player.Also, I found Ruffle
test.tomlhas the configuration section for number approximations, so move the logic fromTest.as.