Skip to content

Commit

Permalink
Rewrite using engine IR lights
Browse files Browse the repository at this point in the history
  • Loading branch information
@BaerMitUmlaut
BaerMitUmlaut committed Jun 21, 2021
1 parent 7199e3d commit a9c3cab
Show file tree
Hide file tree
Showing 15 changed files with 339 additions and 205 deletions.
12 changes: 0 additions & 12 deletions addons/irlight/CfgEventHandlers.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
class Extended_PreStart_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preStart));
};
};

class Extended_PreInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preInit));
};
};

class Extended_PostInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_postInit));
Expand Down
12 changes: 11 additions & 1 deletion addons/irlight/CfgJointRails.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
class asdg_SlotInfo;
class asdg_FrontSideRail: asdg_SlotInfo {
class compatibleItems {
ACE_acc_pointer_IR_flashlight = 1;
ACE_DBAL_A3_Red = 1;
ACE_DBAL_A3_Red_IP = 1;
ACE_DBAL_A3_Red_II = 1;
ACE_DBAL_A3_Red_VP = 1;
ACE_DBAL_A3_Green = 1;
ACE_DBAL_A3_Green_IP = 1;
ACE_DBAL_A3_Green_II = 1;
ACE_DBAL_A3_Green_VP = 1;
ACE_SPIR = 1;
ACE_SPIR_Medium = 1;
ACE_SPIR_Narrow = 1;
};
};
305 changes: 223 additions & 82 deletions addons/irlight/CfgWeapons.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,32 @@
class SlotInfo;
class PointerSlot: SlotInfo {
compatibleItems[] += {
"ACE_acc_pointer_IR_flashlight",
"ACE_acc_pointer_IR_flashlight2",
"ACE_acc_pointer_IR_flashlight3",
"ACE_acc_pointer_IR_flashlight4"
"ACE_DBAL_A3_Red",
"ACE_DBAL_A3_Red_IP",
"ACE_DBAL_A3_Red_II",
"ACE_DBAL_A3_Red_VP",
"ACE_DBAL_A3_Green",
"ACE_DBAL_A3_Green_IP",
"ACE_DBAL_A3_Green_II",
"ACE_DBAL_A3_Green_VP",
"ACE_SPIR",
"ACE_SPIR_Medium",
"ACE_SPIR_Narrow"
};
};
class PointerSlot_Rail: PointerSlot {
class compatibleItems {
ACE_acc_pointer_IR_flashlight = 1;
ACE_acc_pointer_IR_flashlight2 = 1;
ACE_acc_pointer_IR_flashlight3 = 1;
ACE_acc_pointer_IR_flashlight4 = 1;
ACE_DBAL_A3_Red = 1;
ACE_DBAL_A3_Red_IP = 1;
ACE_DBAL_A3_Red_II = 1;
ACE_DBAL_A3_Red_VP = 1;
ACE_DBAL_A3_Green = 1;
ACE_DBAL_A3_Green_IP = 1;
ACE_DBAL_A3_Green_II = 1;
ACE_DBAL_A3_Green_VP = 1;
ACE_SPIR = 1;
ACE_SPIR_Medium = 1;
ACE_SPIR_Narrow = 1;
};
};

Expand All @@ -21,121 +35,248 @@ class CfgWeapons {
class acc_pointer_IR: ItemCore {
class ItemInfo;
};
class ACE_acc_pointer_IR_flashlight: acc_pointer_IR {

class acc_flashlight: ItemCore {
class ItemInfo;
};

// DBAL A3 (red pointer)
class ACE_DBAL_A3_Red: acc_pointer_IR {
author = ECSTRING(common,ACETeam);
displayName = "ACE IR flashlight"; // TODO: stringtable
displayName = CSTRING(DBAL_A3_Red);
descriptionUse = CSTRING(DBAL_A3_DescriptionUse);
descriptionShort = CSTRING(DBAL_A3_DescriptionShort);

MRT_SwitchItemNextClass = "ACE_DBAL_A3_Red_IP";
MRT_SwitchItemPrevClass = "ACE_DBAL_A3_Red_VP";
MRT_SwitchItemHintText = CSTRING(Mode_IRDual);

class ItemInfo: ItemInfo {
class Flashlight {
color[] = {180,160,130};
ambient[] = {0.9,0.81,0.7};
intensity = 5000; // Brightness
size = 1; // TODO: OwO what's this?
innerAngle = 10; // Can't really tell if there are actually two cones?
color[] = {1, 1, 1, 1};
ambient[] = {1, 1, 1, 1};
size = 1;
innerAngle = 10;
outerAngle = 12;
coneFadeCoef = 2; // Higher value = sharper outline
position = "laser pos";
direction = "laser dir";
useFlare = 1;
flareSize = 1.4;
flareMaxDistance = 100;
dayLight = 0;
flareMaxDistance = 200;
scale[] = {0};
coneFadeCoef = 6;
intensity = 100;
irLight = 1;

class Attentuation {
start = 0;
constant = 0.5;
linear = 0.1;
quadratic = 0.1;
hardLimitStart = 500;
hardLimitEnd = 600;
class Attenuation {
constant = 1;
linear = 0;
quadratic = 0;
start = 500;
hardLimitStart = 1;
hardLimitEnd = 500;
};
};
};
};
class ACE_acc_pointer_IR_flashlight2: acc_pointer_IR {

class ACE_DBAL_A3_Red_IP: ACE_DBAL_A3_Red {
scope = 1;

MRT_SwitchItemNextClass = "ACE_DBAL_A3_Red_II";
MRT_SwitchItemPrevClass = "ACE_DBAL_A3_Red";
MRT_SwitchItemHintText = CSTRING(Mode_IRPointer);

class ItemInfo: ItemInfo {
class Flashlight {};
};
};

class ACE_DBAL_A3_Red_II: ACE_DBAL_A3_Red {
scope = 1;

MRT_SwitchItemNextClass = "ACE_DBAL_A3_Red_VP";
MRT_SwitchItemPrevClass = "ACE_DBAL_A3_Red_IP";
MRT_SwitchItemHintText = CSTRING(Mode_IRIlluminator);

class ItemInfo: ItemInfo {
class Pointer {};
};
};

class ACE_DBAL_A3_Red_VP: ACE_DBAL_A3_Red {
scope = 1;
ACE_laserpointer = 1;

MRT_SwitchItemNextClass = "ACE_DBAL_A3_Red";
MRT_SwitchItemPrevClass = "ACE_DBAL_A3_Red_II";
MRT_SwitchItemHintText = CSTRING(Mode_VisiblePointer);

class ItemInfo: ItemInfo {
class Pointer {};
class Flashlight: Flashlight {
color[] = {0, 0, 0, 0};
ambient[] = {0, 0, 0, 0};
size = 0;
innerAngle = 0;
outerAngle = 0;
useFlare = 0;
intensity = 0;
irLight = 0;

class Attenuation: Attenuation {
hardLimitStart = 0;
hardLimitEnd = 0;
};
};
};
};

// DBAL A3 (green pointer)
class ACE_DBAL_A3_Green: ACE_DBAL_A3_Red {
scope = 2;
displayName = CSTRING(DBAL_A3_Green);

MRT_SwitchItemNextClass = "ACE_DBAL_A3_Green_IP";
MRT_SwitchItemPrevClass = "ACE_DBAL_A3_Green_VP";
MRT_SwitchItemHintText = CSTRING(Mode_IRDual);
};

class ACE_DBAL_A3_Green_IP: ACE_DBAL_A3_Red_IP {
scope = 1;
displayName = CSTRING(DBAL_A3_Green);

MRT_SwitchItemNextClass = "ACE_DBAL_A3_Green_II";
MRT_SwitchItemPrevClass = "ACE_DBAL_A3_Green";
MRT_SwitchItemHintText = CSTRING(Mode_IRPointer);
};

class ACE_DBAL_A3_Green_II: ACE_DBAL_A3_Red_II {
scope = 1;
displayName = CSTRING(DBAL_A3_Green);

MRT_SwitchItemNextClass = "ACE_DBAL_A3_Green_VP";
MRT_SwitchItemPrevClass = "ACE_DBAL_A3_Green_IP";
MRT_SwitchItemHintText = CSTRING(Mode_IRIlluminator);
};

class ACE_DBAL_A3_Green_VP: ACE_DBAL_A3_Red_VP {
scope = 1;
displayName = CSTRING(DBAL_A3_Green);
ACE_laserpointer = 2;

MRT_SwitchItemNextClass = "ACE_DBAL_A3_Green";
MRT_SwitchItemPrevClass = "ACE_DBAL_A3_Green_II";
MRT_SwitchItemHintText = CSTRING(Mode_VisiblePointer);
};

// SPIR
class ACE_SPIR: acc_flashlight {
author = ECSTRING(common,ACETeam);
displayName = "SPIR";
descriptionUse = CSTRING(SPIR_DescriptionUse);
descriptionShort = CSTRING(SPIR_DescriptionShort);

MRT_SwitchItemNextClass = "ACE_SPIR_Medium";
MRT_SwitchItemPrevClass = "ACE_SPIR_Narrow";
MRT_SwitchItemHintText = CSTRING(Mode_Wide);

class ItemInfo: ItemInfo {
class Flashlight {
color[] = {180,160,130};
ambient[] = {0.9,0.81,0.7};
intensity = 5000; // Brightness
size = 1; // TODO: OwO what's this?
innerAngle = 10; // Can't really tell if there are actually two cones?
outerAngle = 12;
coneFadeCoef = 4; // Higher value = sharper outline
position = "laser pos";
direction = "laser dir";
color[] = {1, 1, 1, 1};
ambient[] = {1, 1, 1, 1};
size = 1;
innerAngle = 25;
outerAngle = 32;
position = "flash dir";
direction = "flash";
useFlare = 1;
flareSize = 1.4;
flareMaxDistance = 100;
dayLight = 0;
flareMaxDistance = 200;
scale[] = {0};
coneFadeCoef = 6;
intensity = 100;
irLight = 1;

class Attentuation {
start = 0;
constant = 0.5;
linear = 0.1;
quadratic = 0.1;
hardLimitStart = 500;
hardLimitEnd = 600;
class Attenuation {
constant = 1;
linear = 0;
quadratic = 0;
start = 200;
hardLimitStart = 1;
hardLimitEnd = 200;
};
};
};
};
class ACE_acc_pointer_IR_flashlight3: acc_pointer_IR {

class ACE_SPIR_Medium: ACE_SPIR {
scope = 1;

MRT_SwitchItemNextClass = "ACE_SPIR_Narrow";
MRT_SwitchItemPrevClass = "ACE_SPIR";
MRT_SwitchItemHintText = CSTRING(Mode_Medium);

class ItemInfo: ItemInfo {
class Flashlight {
color[] = {180,160,130};
ambient[] = {0.9,0.81,0.7};
intensity = 5000; // Brightness
size = 1; // TODO: OwO what's this?
innerAngle = 10; // Can't really tell if there are actually two cones?
outerAngle = 12;
coneFadeCoef = 6; // Higher value = sharper outline
position = "laser pos";
direction = "laser dir";
color[] = {1, 1, 1, 1};
ambient[] = {1, 1, 1, 1};
size = 1;
position = "flash dir";
direction = "flash";
useFlare = 1;
flareSize = 1.4;
flareMaxDistance = 100;
dayLight = 0;
flareMaxDistance = 200;
scale[] = {0};
coneFadeCoef = 6;
intensity = 100;
irLight = 1;
innerAngle = 10;
outerAngle = 12;

class Attentuation {
start = 0;
constant = 0.5;
linear = 0.1;
quadratic = 0.1;
hardLimitStart = 500;
hardLimitEnd = 600;
class Attenuation {
constant = 1;
linear = 0;
quadratic = 0;
hardLimitStart = 1;
start = 350;
hardLimitEnd = 350;
};
};
};
};
class ACE_acc_pointer_IR_flashlight4: acc_pointer_IR {

class ACE_SPIR_Narrow: ACE_SPIR {
scope = 1;

MRT_SwitchItemNextClass = "ACE_SPIR";
MRT_SwitchItemPrevClass = "ACE_SPIR_Medium";
MRT_SwitchItemHintText = CSTRING(Mode_Narrow);

class ItemInfo: ItemInfo {
class Flashlight {
color[] = {180,160,130};
ambient[] = {0.9,0.81,0.7};
intensity = 5000; // Brightness
size = 1; // TODO: OwO what's this?
innerAngle = 10; // Can't really tell if there are actually two cones?
outerAngle = 12;
coneFadeCoef = 8; // Higher value = sharper outline
position = "laser pos";
direction = "laser dir";
color[] = {1, 1, 1, 1};
ambient[] = {1, 1, 1, 1};
size = 1;
position = "flash dir";
direction = "flash";
useFlare = 1;
flareSize = 1.4;
flareMaxDistance = 100;
dayLight = 0;
flareMaxDistance = 200;
scale[] = {0};
coneFadeCoef = 6;
intensity = 100;
irLight = 1;
innerAngle = 5;
outerAngle = 6;

class Attentuation {
start = 0;
constant = 0.5;
linear = 0.1;
quadratic = 0.1;
hardLimitStart = 500;
hardLimitEnd = 600;
class Attenuation {
constant = 1;
linear = 0;
quadratic = 0;
hardLimitStart = 1;
start = 500;
hardLimitEnd = 500;
};
};
};
Expand Down
Loading

0 comments on commit a9c3cab

Please sign in to comment.