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

Ported the ACE2 MX-2A thermal imaging device #1476

Merged
merged 3 commits into from
Jun 3, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added addons/apl/LWTS_optic.p3d
Binary file not shown.
8 changes: 8 additions & 0 deletions addons/apl/data/default.rvmat
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ambient[]={1,1,1,1};
diffuse[]={1,1,1,1};
forcedDiffuse[]={0,0,0,0};
emmisive[]={0,0,0,1};
specular[]={0,0,0,0};
specularPower=0;
PixelShaderID="Normal";
VertexShaderID="Basic";
Binary file added addons/apl/data/optics_bg_blurred_round_ca.paa
Binary file not shown.
Binary file added addons/apl/data/optics_bg_square_ca.paa
Binary file not shown.
Binary file added addons/apl/data/twis_m16_ca.paa
Binary file not shown.
1 change: 1 addition & 0 deletions addons/mx2a/$PBOPREFIX$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
z\ace\addons\mx2a
20 changes: 20 additions & 0 deletions addons/mx2a/CfgVehicles.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
class CfgVehicles {
class Item_Base_F;
class ACE_Item_MX2A: Item_Base_F {
author[] = {"Spooner", "tcp"};
scope = 2;
scopeCurator = 2;
displayName = "$STR_ACE_MX2A_DisplayName";
vehicleClass = "Items";
class TransportWeapons {
MACRO_ADDWEAPON(ACE_MX2A,1);
};
};

class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F {
class TransportWeapons {
MACRO_ADDWEAPON(ACE_MX2A,6);
};
};
};
26 changes: 26 additions & 0 deletions addons/mx2a/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

class CfgWeapons {
class Binocular;
class ACE_MX2A: Binocular {
author = "$STR_ACE_Common_ACETeam";
displayName = "$STR_ACE_MX2A_DisplayName";
descriptionShort = "$STR_ACE_MX2A_Description";
model = PATHTOF(data\ace_mx2a.p3d);
modelOptics = QUOTE(PATHTOEF(apl,LWTS_optic.p3d));
picture = PATHTOF(UI\w_mx2a_ca.paa);
opticsZoomMax = 0.1;
distanceZoomMax = 120;
opticsZoomMin = 0.05;
distanceZoomMin = 400;
opticsZoomInit = 0.1;
visionMode[] = {"Ti"};
thermalMode[] = {0,1};
discretefov[] = {0.33333/1, 0.33333/2}; // 1x/2x -- http://www.drs.com/Products/RSTA/PDF/MX2A.pdf
discreteInitIndex = 0;
discreteDistance[] = {120,400};
discreteDistanceInitIndex = 1;
class WeaponSlotsInfo {
mass = 20;
};
};
};
10 changes: 10 additions & 0 deletions addons/mx2a/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ace_mx2a
==========

Adds the MX-2A thermal imaging device.

## Maintainers

The people responsible for merging changes to this component or answering potential questions.

- [Ruthberg] (http://github.com/Ulteq)
Binary file added addons/mx2a/UI/w_mx2a_ca.paa
Binary file not shown.
15 changes: 15 additions & 0 deletions addons/mx2a/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
units[] = {"ACE_Item_MX2A"};
weapons[] = {"ACE_MX2A"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_apl"};
author[] = {"Spooner", "tcp"};
VERSION_CONFIG;
};
};

#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
Binary file added addons/mx2a/data/ace_mx2a.p3d
Binary file not shown.
Binary file added addons/mx2a/data/mx2A_ti_ca.paa
Binary file not shown.
81 changes: 81 additions & 0 deletions addons/mx2a/data/mx2a.rvmat
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
ambient[]={1,1,1,1};
diffuse[]={1,1,1,1};
forcedDiffuse[]={0,0,0,0};
emmisive[]={0,0,0,1};
specular[]={0.1,0.1,0.1,1};
specularPower=30;
PixelShaderID="Super";
VertexShaderID="Super";
class Stage1 {
texture="z\ace\addons\mx2a\data\mx2a_nohq.paa";
uvSource="tex";
class uvTransform {
aside[]={1,0,0};
up[]={0,1,0};
dir[]={0,0,0};
pos[]={0,0,0};
};
};
class Stage2 {
texture="a3\weapons_f\data\detailmaps\metal_detail_dt.paa";
uvSource="tex";
class uvTransform {
aside[]={2,-1.568,0};
up[]={1.568,4,0};
dir[]={0,0,0};
pos[]={0,0,0};
};
};
class Stage3 {
texture="#(argb,8,8,3)color(0,0,0,0,MC)";
uvSource="tex";
class uvTransform {
aside[]={0.98480773,-0.17364819,0};
up[]={0.17364819,0.98480773,0};
dir[]={0,0,0};
pos[]={0,0,0};
};
};
class Stage4 {
texture="z\ace\addons\mx2a\data\mx2a_as.paa";
uvSource="tex";
class uvTransform {
aside[]={1,0,0};
up[]={0,1,0};
dir[]={0,0,0};
pos[]={0,0,0};
};
};
class Stage5 {
texture="z\ace\addons\mx2a\data\mx2a_smdi.paa";
uvSource="tex";
class uvTransform {
aside[]={1,0,0};
up[]={0,1,0};
dir[]={0,0,0};
pos[]={0,0,0};
};
};
class Stage6 {
texture="#(ai,16,2,2)fresnel(1.5,1.22)";
uvSource="tex";
class uvTransform {
aside[]={1,0,0};
up[]={0,1,0};
dir[]={0,0,0};
pos[]={0,0,0};
};
};
class Stage7 {
texture="a3\data_f\env_land_co.paa";
uvSource="tex";
class uvTransform {
aside[]={1,0,0};
up[]={0,1,0};
dir[]={0,0,0};
pos[]={0,0,0};
};
};
class StageTI {
texture="z\ace\addons\mx2a\data\mx2a_ti_ca.paa";
};
Binary file added addons/mx2a/data/mx2a_as.paa
Binary file not shown.
Binary file added addons/mx2a/data/mx2a_co.paa
Binary file not shown.
Binary file added addons/mx2a/data/mx2a_nohq.paa
Binary file not shown.
Binary file added addons/mx2a/data/mx2a_smdi.paa
Binary file not shown.
12 changes: 12 additions & 0 deletions addons/mx2a/script_component.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#define COMPONENT mx2a
#include "\z\ace\addons\main\script_mod.hpp"

#ifdef DEBUG_ENABLED_MX2A
#define DEBUG_MODE_FULL
#endif

#ifdef DEBUG_SETTINGS_MX2A
#define DEBUG_SETTINGS DEBUG_SETTINGS_MX2A
#endif

#include "\z\ace\addons\main\script_macros.hpp"
12 changes: 12 additions & 0 deletions addons/mx2a/stringtable.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="MX2A">
<Key ID="STR_ACE_MX2A_DisplayName">
<English>MX-2A</English>
</Key>
<Key ID="STR_ACE_MX2A_Description">
<English>Thermal imaging device</English>
<German>Wärmebildgerät</German>
</Key>
</Package>
</Project>