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

Updated spotting scope model. #2832

Merged
merged 2 commits into from
Nov 24, 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
15 changes: 8 additions & 7 deletions addons/spottingscope/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class CfgVehicles {
side = 1;
typicalCargo[] = {"Soldier"};
displayName = CSTRING(DisplayName);
model = PATHTOF(data\spottingscope.p3d);
model = PATHTOF(data\ace_spottingscope.p3d);
mapSize = 0.5;
transportSoldier = 0;
getInAction = "GetInLow";
Expand Down Expand Up @@ -89,9 +89,9 @@ class CfgVehicles {
initAngleY = 0;
minAngleY = -100;
maxAngleY = 100;
initFov = 0.7;
minFov = 0.7;
maxFov = 0.7;
initFov = 0.75;
minFov = 0.25;
maxFov = 1.25;
Copy link
Contributor

Choose a reason for hiding this comment

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

white space

};
class ViewOptics {
initAngleX = 0;
Expand All @@ -100,9 +100,10 @@ class CfgVehicles {
initAngleY = 0;
minAngleY = -100;
maxAngleY = 100;
initFov = 0.014812;
minFov = 0.014812;
maxFov = 0.014812;

minFov = 0.0025;
maxFov = 0.05;
initFov= 0.05;
Copy link
Contributor

Choose a reason for hiding this comment

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

tabs

};
};
};
Expand Down
2 changes: 1 addition & 1 deletion addons/spottingscope/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class CfgWeapons {
displayName = CSTRING(DisplayName);
descriptionShort = "";
picture = PATHTOF(UI\w_spottingscope_ca.paa);
model = PATHTOF(data\w_spottingscope.p3d);
model = PATHTOF(data\ace_spottingscope.p3d);

class ItemInfo: InventoryItem_Base_F {
mass = 40;
Expand Down
2 changes: 1 addition & 1 deletion addons/spottingscope/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class CfgPatches {
weapons[] = {"ACE_SpottingScope"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_apl", "ace_interaction"};
author[] = {"Rocko", "Scubaman3D", "Ruthberg", "commy2"};
author[] = {"Rocko", "Scubaman3D", "Ruthberg", "commy2", "p1nga"};
VERSION_CONFIG;
};
};
Expand Down
Binary file added addons/spottingscope/data/ace_spottingscope.p3d
Binary file not shown.
Binary file not shown.
Binary file not shown.
96 changes: 96 additions & 0 deletions addons/spottingscope/data/ace_spottingscope_glass.rvmat
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
class StageTI
{
texture="a3\data_f\Default_ti_ca.paa";
};
ambient[]={0.301,0.63999999,0.68000001,1};
diffuse[]={0.301,0.63999999,0.68000001,1};
forcedDiffuse[]={0.2,0.34999999,0.2,0};
emmisive[]={0,0,0,1};
specular[]={0.67450982,0.64313728,0.50196081,1};
specularPower=550;
PixelShaderID="Super";
VertexShaderID="Super";
class Stage1
{
texture="z\ace\addons\spottingscope\data\ace_spottingscope_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="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
uvSource="tex";
class uvTransform
{
aside[]={6,0,0};
up[]={0,6,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[]={1,0,0};
up[]={0,1,0};
dir[]={0,0,0};
pos[]={0,0,0};
};
};
class Stage4
{
texture="z\ace\addons\spottingscope\data\ace_spottingscope_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\spottingscope\data\ace_spottingscope_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,32,128,1)fresnel(4.01,2.86)";
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};
};
};
Binary file not shown.
92 changes: 92 additions & 0 deletions addons/spottingscope/data/ace_spottingscope_metal.rvmat
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
ambient[]={1,1,1,1};
diffuse[]={1,1,1,1};
forcedDiffuse[]={0,0,0,0};
emmisive[]={0,0,0,1};
specular[]={0.2,0.2,0.2,0};
specularPower=100;
PixelShaderID="Super";
VertexShaderID="Super";
class Stage1
{
texture="z\ace\addons\spottingscope\data\ace_spottingscope_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="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
uvSource="tex";
class uvTransform
{
aside[]={6,0,0};
up[]={0,6,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[]={1,0,0};
up[]={0,1,0};
dir[]={0,0,0};
pos[]={0,0,0};
};
};
class Stage4
{
texture="z\ace\addons\spottingscope\data\ace_spottingscope_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\spottingscope\data\ace_spottingscope_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,32,128,1)fresnel(4.01,2.86)";
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};
};
};
Binary file not shown.
85 changes: 85 additions & 0 deletions addons/spottingscope/data/ace_spottingscope_rubber.rvmat
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
ambient[]={1,1,1,1};
diffuse[]={1,1,1,1};
forcedDiffuse[]={0,0,0,0};
emmisive[]={0,0,0,1};
specular[]={0.25,0.25,0.25,1};
specularPower=90;
PixelShaderID="Super";
VertexShaderID="Super";
class Stage1
{
texture="z\ace\addons\spottingscope\data\ace_spottingscope_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="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
uvSource="tex";
class uvTransform
{
aside[]={6,0,0};
up[]={0,6,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[]={1,0,0};
up[]={0,1,0};
dir[]={0,0,0};
pos[]={0,0,0};
};
};
class Stage4
{
texture="z\ace\addons\spottingscope\data\ace_spottingscope_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\spottingscope\data\ace_spottingscope_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,64,64,1)fresnel(1.5,1.22)";
uvSource="none";
};
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};
};
};
Binary file not shown.
Binary file modified addons/spottingscope/data/m144_ca.paa
Binary file not shown.
36 changes: 29 additions & 7 deletions addons/spottingscope/data/model.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@ class CfgSkeletons
isDiscrete = 1;
skeletonInherit = "Default";
skeletonBones[] = {
"otocvez","",
"otochlaven","otocvez"
"main_turret","",
"main_gun","main_turret",

"leg_01","",
"leg_02","",
"leg_03",""
Copy link
Contributor

Choose a reason for hiding this comment

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

tabs

};
};
};
Expand All @@ -20,15 +24,15 @@ class CfgModels {
sections[] = {};
skeletonName = "";
};
class spottingscope: Default {
class ace_spottingscope: Default {
skeletonName = "ace_spottingscope_skeleton";
sectionsInherit = "Default";
class animations {
class mainTurret {
type = "rotationY";
source = "mainTurret";
selection = "otocvez";
axis = "osaveze";
selection = "main_turret";
axis = "main_turret_axis";
minValue = "rad -360";
maxValue = "rad +360";
angle0 = "rad -360";
Expand All @@ -37,13 +41,31 @@ class CfgModels {
class mainGun {
type = "rotationX";
source = "mainGun";
selection = "otochlaven";
axis = "osahlavne";
selection = "main_gun";
axis = "main_gun_axis";
minValue = "rad -360";
maxValue = "rad +360";
angle0 = "rad -360";
angle1 = "rad +360";
};
class leg_01 {
type = "rotation";
source = "fold_legs";
selection = "leg_01";
axis="leg_01_axis";
minValue = 0;
maxValue = 1;
angle0="rad +00";
angle1="rad +55";
};
class leg_02: leg_01 {
selection = "leg_02";
axis="leg_02_axis";
};
class leg_03: leg_01 {
selection = "leg_03";
axis="leg_03_axis";
};
Copy link
Contributor

Choose a reason for hiding this comment

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

tabs

};
};
};