Skip to content
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

XM157 (NGSW-FC Smart Scope) Framework #8897

Merged
merged 11 commits into from
Sep 1, 2022
Merged

XM157 (NGSW-FC Smart Scope) Framework #8897

merged 11 commits into from
Sep 1, 2022

Conversation

PabstMirror
Copy link
Contributor

@PabstMirror PabstMirror commented May 2, 2022

Adds XM157 NGSW Fire Control Optic
Scope with integrated rangefinder and ballistic computer
Sorta using cba scripted optics, but a lot of it redone for ctrlObject so I can do proper rotation

Demo: https://www.youtube.com/watch?v=mgtT4ZBFJvU

ToDo:
3d Model???
POI marking and sharing (sounds a lot like ace_finger, can share targets via short-range wireless)

This thing isn't released so some assumptions are made as to how it works.

Some References:

https://www.youtube.com/watch?v=y7NLMU1JZkY 
https://www.youtube.com/watch?v=g6nob-XOBt0
Vortex reticle plan: https://vortexoptics.com/media/wysiwyg//sub_RazorHD3_EBR-9_mrad_1-10x24.jpg
https://www.youtube.com/watch?v=RpXJfCJMcqs - L3 Harris's optic in-action (lost the competition to Vortex but assuming similar functionality)

@PabstMirror PabstMirror added the kind/feature Release Notes: **ADDED:** label May 2, 2022
@PabstMirror PabstMirror added this to the Ongoing milestone May 2, 2022
Comment on lines +43 to +45
private _gravity = [-sin (_bank) * cos(_scopeBaseAngle + _inclinationAngle) * -GRAVITY,
sin(_scopeBaseAngle + _inclinationAngle) * -GRAVITY,
cos (_bank) * cos(_scopeBaseAngle + _inclinationAngle) * -GRAVITY];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private _gravity = [-sin (_bank) * cos(_scopeBaseAngle + _inclinationAngle) * -GRAVITY,
sin(_scopeBaseAngle + _inclinationAngle) * -GRAVITY,
cos (_bank) * cos(_scopeBaseAngle + _inclinationAngle) * -GRAVITY];
private _angleGravity = (_scopeBaseAngle + _inclinationAngle) * -GRAVITY;
private _gravity = [-sin (_bank) * cos (_angleGravity),
sin (_angleGravity),
cos (_bank) * cos (_angleGravity)];

(_angleGravity might be an unimaginative or even a misleading name, though.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't want GRAVITY in that term

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this func base very closely on https://github.com/acemod/ACE3/blob/master/addons/atragmx/functions/fnc_calculate_solution.sqf#L61

tbh I'm not really sure why that modifies gravity instead of initial velocity, but I trust ulteq's work so I'd like to keep this func as close to that as possible

PabstMirror and others added 4 commits May 7, 2022 12:55
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
@PabstMirror
Copy link
Contributor Author

demo of menu https://www.youtube.com/watch?v=qYJwUBlGFsc

I know they talked about being able to draw any reticle because it's a lcd screen,
but I'm not sure I like how it looks right now, the styles are too different and not really consistent

@PabstMirror PabstMirror changed the title WIP - XM157 (NGSW-FC Smart Scope) XM157 (NGSW-FC Smart Scope) May 27, 2022
@PabstMirror PabstMirror changed the title XM157 (NGSW-FC Smart Scope) XM157 (NGSW-FC Smart Scope) Framework May 27, 2022
@PabstMirror PabstMirror modified the milestones: Ongoing, 3.15.1 May 27, 2022
looks like CUP modifies EtelkaMonospaceProBold for some reason??
addons/xm157/CfgWeapons.hpp Show resolved Hide resolved
addons/xm157/CfgWeapons.hpp Outdated Show resolved Hide resolved
addons/xm157/CfgWeapons.hpp Show resolved Hide resolved
addons/xm157/stringtable.xml Outdated Show resolved Hide resolved
Copy link
Member

@veteran29 veteran29 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@PabstMirror PabstMirror merged commit cc3bad3 into master Sep 1, 2022
@PabstMirror PabstMirror deleted the scopeStuff branch September 1, 2022 18:44
BrettMayson pushed a commit to BrettMayson/ACE3 that referenced this pull request Oct 10, 2022
* XM157 (NGSW-FC Smart Scope)

* Update addons/common/functions/fnc_rscObjectHelper.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/xm157/functions/fnc_weaponInfo_draw.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Headers

* Handle prone-deploy weapon bank

* Disable Reticle picker for now

* some localizations

* Change font

looks like CUP modifies EtelkaMonospaceProBold for some reason??

* Create xm157-framework.md

* Formating

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
RusComBear pushed a commit to RusComBear/ACE3 that referenced this pull request Dec 29, 2023
* XM157 (NGSW-FC Smart Scope)

* Update addons/common/functions/fnc_rscObjectHelper.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/xm157/functions/fnc_weaponInfo_draw.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Headers

* Handle prone-deploy weapon bank

* Disable Reticle picker for now

* some localizations

* Change font

looks like CUP modifies EtelkaMonospaceProBold for some reason??

* Create xm157-framework.md

* Formating

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants