Добавлен ЭП20

This commit is contained in:
Alex_BY 2016-03-19 16:27:03 +03:00
parent 009dfc6bd1
commit 2ef87f6eba
42 changed files with 577 additions and 100 deletions

Binary file not shown.

View File

@ -7,10 +7,10 @@ return {
refDist = 25.0,
horn = "vehicle/ep20horn.wav",
horn = "vehicle/EP20_Horn.wav",
params = {
tracks = {
{ clip = "vehicle/ep20.wav",
{ clip = "vehicle/EP20.wav",
gainCurve = {
nodes = audioutil.plotSqrt(.0, .1, 1.0, 1.0, 10)
},

View File

@ -0,0 +1,59 @@
function data()
return {
children = {
{
id = "vehicle/train/EP20/EP20_020.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1,
},
type = "MESH",
}, {
id = "vehicle/train/EP20_Bogie_1.grp",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
6.62, 0, 0, 1,
},
type = "GROUP",
}, {
id = "vehicle/train/EP20_Bogie_2.grp",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1,
},
type = "GROUP",
}, {
id = "vehicle/train/EP20_Bogie_3.grp",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
-6.62, 0, 0, 1,
},
type = "GROUP",
}, {
id = "vehicle/train/EP20/EP20_Glass.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1,
},
type = "MESH",
},
},
matConfigs = {
{ 0, 0, 0, 0, 0, }
},
}
end

View File

@ -0,0 +1,41 @@
function data()
return {
children = {
{
id = "vehicle/train/EP20/EP20_Bogie_1.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1,
},
type = "MESH",
},
{
id = "vehicle/train/EP20/EP20_Wheels.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
1.42, 0, 0.59, 1,
},
type = "MESH",
},
{
id = "vehicle/train/EP20/EP20_Wheels.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
-1.42, 0, 0.59, 1,
},
type = "MESH",
},
},
matConfigs = {
{ 0, 0, 0}
},
}
end

View File

@ -0,0 +1,41 @@
function data()
return {
children = {
{
id = "vehicle/train/EP20/EP20_Bogie_2.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1,
},
type = "MESH",
},
{
id = "vehicle/train/EP20/EP20_Wheels.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
1.42, 0, 0.59, 1,
},
type = "MESH",
},
{
id = "vehicle/train/EP20/EP20_Wheels.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
-1.42, 0, 0.59, 1,
},
type = "MESH",
},
},
matConfigs = {
{ 0, 0, 0}
},
}
end

View File

@ -0,0 +1,41 @@
function data()
return {
children = {
{
id = "vehicle/train/EP20/EP20_Bogie_3.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1,
},
type = "MESH",
},
{
id = "vehicle/train/EP20/EP20_Wheels.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
1.42, 0, 0.59, 1,
},
type = "MESH",
},
{
id = "vehicle/train/EP20/EP20_Wheels.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
-1.42, 0, 0.59, 1,
},
type = "MESH",
},
},
matConfigs = {
{ 0, 0, 0}
},
}
end

View File

@ -2,7 +2,7 @@ function data()
return {
children = {
{
id = "vehicle/train/ep20/ep20_bogie.msh",
id = "vehicle/train/EP20/EP20.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
@ -10,32 +10,50 @@ return {
0, 0, 0, 1,
},
type = "MESH",
},
{
id = "vehicle/train/ep20/ep20_wheels.msh",
}, {
id = "vehicle/train/EP20_Bogie_1.grp",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
1.42, 0, 0.63, 1,
6.62, 0, 0, 1,
},
type = "MESH",
type = "GROUP",
},
{
id = "vehicle/train/ep20/ep20_wheels.msh",
}, {
id = "vehicle/train/EP20_Bogie_2.grp",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
-1.42, 0, 0.63, 1,
0, 0, 0, 1,
},
type = "GROUP",
}, {
id = "vehicle/train/EP20_Bogie_3.grp",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
-6.62, 0, 0, 1,
},
type = "GROUP",
}, {
id = "vehicle/train/EP20/EP20_Glass.msh",
transf = {
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1,
},
type = "MESH",
},
},
matConfigs = {
{ 0, 0, 0}
{ 0, 0, 0, 0, 0, }
},
}
end

View File

@ -0,0 +1,40 @@
function data()
return
{
params =
{
fade_out_range = { fadeOutEndDist = 20000, fadeOutStartDist = 10000, },
map_color_reflect =
{
compressionAllowed = true,
fileName = "models/vehicle/train/EP20_020.tga",
magFilter = "LINEAR", minFilter = "LINEAR_MIPMAP_LINEAR",
mipmapAlphaScale = 0,
type = "TWOD",
wrapS = "REPEAT", wrapT = "REPEAT",
},
map_env = -- Cube map
{
compressionAllowed = true,
fileName = "c.tga",
magFilter = "LINEAR", minFilter = "LINEAR",
mipmapAlphaScale = 0,
type = "CUBE_MAP",
wrapS = "REPEAT", wrapT = "REPEAT",
},
map_normal =
{
compressionAllowed = true,
fileName = "models/vehicle/train/EP20_020_nrml.tga",
magFilter = "LINEAR", minFilter = "LINEAR_MIPMAP_LINEAR",
mipmapAlphaScale = 0,
type = "TWOD",
wrapS = "REPEAT", wrapT = "REPEAT",
},
polygon_offset = { factor = 0, units = 0, },
props = { coeffs = { 1, 1, 1.0, 10, }, },
two_sided = { twoSided = false, },
},
type = "REFLECTIVE_NRML_MAP",
}
end

View File

@ -0,0 +1,59 @@
function data()
return {
params = {
alpha_scale = {
alphaScale = 1,
},
alpha_test = {
alphaThreshold = 0.95,
preferAlphaToCoverage = true,
},
fade_out_range = {
fadeOutEndDist = 20000,
fadeOutStartDist = 10000,
},
map_color_alpha = {
compressionAllowed = true,
fileName = "models/vehicle/train/EP20_Glass.tga",
magFilter = "LINEAR",
minFilter = "LINEAR_MIPMAP_LINEAR",
mipmapAlphaScale = 0,
type = "TWOD",
wrapS = "REPEAT",
wrapT = "REPEAT",
},
map_normal = {
compressionAllowed = false,
fileName = "models/vehicle/train/EP20_Glass_nrml.tga",
magFilter = "LINEAR",
minFilter = "LINEAR_MIPMAP_LINEAR",
mipmapAlphaScale = 0,
type = "TWOD",
wrapS = "REPEAT",
wrapT = "REPEAT",
},
polygon_offset = {
factor = 0,
units = 0,
},
props = {
coeffs = {
1, 1, 0.9, 10,
},
},
two_sided = {
twoSided = false,
},
},
type = "TRANSPARENT_NRML_MAP",
}
end

View File

@ -1,13 +1,13 @@
function data()
function data()
return
{
params =
{
fade_out_range = { fadeOutEndDist = 20000, fadeOutStartDist = 10000, },
map_color_reflect = -- Color map è reflection map
map_color_reflect =
{
compressionAllowed = true,
fileName = "models/vehicle/train/ep20.tga", -- Ïóòü ê òåêñòóðå
fileName = "models/vehicle/train/EP20.tga",
magFilter = "LINEAR", minFilter = "LINEAR_MIPMAP_LINEAR",
mipmapAlphaScale = 0,
type = "TWOD",
@ -16,16 +16,16 @@ return
map_env = -- Cube map
{
compressionAllowed = true,
fileName = "c.tga", -- Ïóòü ê òåêñòóðå, c.tga - ñòàíäàðòíûé cubemap
fileName = "c.tga",
magFilter = "LINEAR", minFilter = "LINEAR",
mipmapAlphaScale = 0,
type = "CUBE_MAP",
wrapS = "REPEAT", wrapT = "REPEAT",
},
map_normal = -- Normap map è specular map
map_normal =
{
compressionAllowed = true,
fileName = "models/vehicle/train/ep20_nrml.tga", -- Ïóòü ê òåêñòóðå
fileName = "models/vehicle/train/EP20_nrml.tga",
magFilter = "LINEAR", minFilter = "LINEAR_MIPMAP_LINEAR",
mipmapAlphaScale = 0,
type = "TWOD",
@ -33,8 +33,8 @@ return
},
polygon_offset = { factor = 0, units = 0, },
props = { coeffs = { 1, 1, 1.0, 10, }, },
two_sided = { twoSided = false, }, -- Íóæíî óñòàíîâèòü true, åñëè ìîäåëü ñîäåðæèò äâóõñòîðîííèå ïîëèãîíû
two_sided = { twoSided = false, },
},
type = "REFLECTIVE_NRML_MAP", -- Øåéäåð
type = "REFLECTIVE_NRML_MAP",
}
end

View File

@ -6,7 +6,7 @@ return {
},
alpha_test = {
alphaThreshold = 0.5,
alphaThreshold = 0.3,
preferAlphaToCoverage = true,
},
@ -16,7 +16,7 @@ return {
},
map_color_alpha = {
compressionAllowed = true,
fileName = "models/vehicle/train/ep20_light.tga",
fileName = "models/vehicle/train/EP20_Light.tga",
magFilter = "LINEAR",
minFilter = "LINEAR_MIPMAP_LINEAR",
mipmapAlphaScale = 1.2,

View File

@ -0,0 +1,22 @@
function data() return {
animations = {
},
matConfigs = { { 0, }, },
subMeshes = { {
indices = {
normal = { count = 223452, offset = 2681424, },
position = { count = 223452, offset = 2904876, },
tangent = { count = 223452, offset = 3128328, },
uv0 = { count = 223452, offset = 3351780, },
},
materials = { "vehicle/train/EP20_020.mtl" },
}, },
vertexAttr =
{
normal = { count = 670356, numComp = 3, offset = 0, },
position = { count = 670356, numComp = 3, offset = 670356, },
tangent = { count = 893808, numComp = 4, offset = 1340712, },
uv0 = { count = 446904, numComp = 2, offset = 2234520, },
},
} end

Binary file not shown.

View File

@ -0,0 +1,22 @@
function data() return {
animations = {
},
matConfigs = { { 0, }, },
subMeshes = { {
indices = {
normal = { count = 30264, offset = 363168, },
position = { count = 30264, offset = 393432, },
tangent = { count = 30264, offset = 423696, },
uv0 = { count = 30264, offset = 453960, },
},
materials = { "vehicle/train/EP20.mtl" },
}, },
vertexAttr =
{
normal = { count = 90792, numComp = 3, offset = 0, },
position = { count = 90792, numComp = 3, offset = 90792, },
tangent = { count = 121056, numComp = 4, offset = 181584, },
uv0 = { count = 60528, numComp = 2, offset = 302640, },
},
} end

View File

@ -0,0 +1,22 @@
function data() return {
animations = {
},
matConfigs = { { 0, }, },
subMeshes = { {
indices = {
normal = { count = 30264, offset = 363168, },
position = { count = 30264, offset = 393432, },
tangent = { count = 30264, offset = 423696, },
uv0 = { count = 30264, offset = 453960, },
},
materials = { "vehicle/train/EP20.mtl" },
}, },
vertexAttr =
{
normal = { count = 90792, numComp = 3, offset = 0, },
position = { count = 90792, numComp = 3, offset = 90792, },
tangent = { count = 121056, numComp = 4, offset = 181584, },
uv0 = { count = 60528, numComp = 2, offset = 302640, },
},
} end

View File

@ -0,0 +1,22 @@
function data() return {
animations = {
},
matConfigs = { { 0, }, },
subMeshes = { {
indices = {
normal = { count = 30264, offset = 363168, },
position = { count = 30264, offset = 393432, },
tangent = { count = 30264, offset = 423696, },
uv0 = { count = 30264, offset = 453960, },
},
materials = { "vehicle/train/EP20.mtl" },
}, },
vertexAttr =
{
normal = { count = 90792, numComp = 3, offset = 0, },
position = { count = 90792, numComp = 3, offset = 90792, },
tangent = { count = 121056, numComp = 4, offset = 181584, },
uv0 = { count = 60528, numComp = 2, offset = 302640, },
},
} end

View File

@ -0,0 +1,22 @@
function data() return {
animations = {
},
matConfigs = { { 0, }, },
subMeshes = { {
indices = {
normal = { count = 432, offset = 5184, },
position = { count = 432, offset = 5616, },
tangent = { count = 432, offset = 6048, },
uv0 = { count = 432, offset = 6480, },
},
materials = { "vehicle/train/EP20_Glass.mtl" },
}, },
vertexAttr =
{
normal = { count = 1296, numComp = 3, offset = 0, },
position = { count = 1296, numComp = 3, offset = 1296, },
tangent = { count = 1728, numComp = 4, offset = 2592, },
uv0 = { count = 864, numComp = 2, offset = 4320, },
},
} end

Binary file not shown.

View File

@ -5,18 +5,18 @@ function data() return {
matConfigs = { { 0, }, },
subMeshes = { {
indices = {
normal = { count = 223656, offset = 2683872, },
position = { count = 223656, offset = 2907528, },
tangent = { count = 223656, offset = 3131184, },
uv0 = { count = 223656, offset = 3354840, },
normal = { count = 223452, offset = 2681424, },
position = { count = 223452, offset = 2904876, },
tangent = { count = 223452, offset = 3128328, },
uv0 = { count = 223452, offset = 3351780, },
},
materials = { "vehicle/train/ep20.mtl" },
materials = { "vehicle/train/EP20.mtl" },
}, },
vertexAttr =
{
normal = { count = 670968, numComp = 3, offset = 0, },
position = { count = 670968, numComp = 3, offset = 670968, },
tangent = { count = 894624, numComp = 4, offset = 1341936, },
uv0 = { count = 447312, numComp = 2, offset = 2236560, },
normal = { count = 670356, numComp = 3, offset = 0, },
position = { count = 670356, numComp = 3, offset = 670356, },
tangent = { count = 893808, numComp = 4, offset = 1340712, },
uv0 = { count = 446904, numComp = 2, offset = 2234520, },
},
} end

View File

@ -26,18 +26,18 @@ animations = {
matConfigs = { { 0, }, },
subMeshes = { {
indices = {
normal = { count = 192, offset = 2304, },
position = { count = 192, offset = 2496, },
tangent = { count = 192, offset = 2688, },
uv0 = { count = 192, offset = 2880, },
normal = { count = 240, offset = 2880, },
position = { count = 240, offset = 3120, },
tangent = { count = 240, offset = 3360, },
uv0 = { count = 240, offset = 3600, },
},
materials = { "vehicle/train/ep20_light.mtl" },
materials = { "vehicle/train/EP20_Light.mtl" },
}, },
vertexAttr =
{
normal = { count = 576, numComp = 3, offset = 0, },
position = { count = 576, numComp = 3, offset = 576, },
tangent = { count = 768, numComp = 4, offset = 1152, },
uv0 = { count = 384, numComp = 2, offset = 1920, },
normal = { count = 720, numComp = 3, offset = 0, },
position = { count = 720, numComp = 3, offset = 720, },
tangent = { count = 960, numComp = 4, offset = 1440, },
uv0 = { count = 480, numComp = 2, offset = 2400, },
},
} end

View File

@ -10,7 +10,7 @@ function data() return {
tangent = { count = 1032, offset = 14448, },
uv0 = { count = 1032, offset = 15480, },
},
materials = { "vehicle/train/ep20.mtl" },
materials = { "vehicle/train/EP20.mtl" },
}, },
vertexAttr =
{

View File

@ -2,10 +2,10 @@
return {
boundingInfo = {
bbMax = {
11.22, 1.55, 6.7,
11.0635, 1.75148, 5.89676,
},
bbMin = {
-11.22, -1.55, 0,
-11.0635, -1.8037, -0.0692888,
},
},
@ -22,43 +22,16 @@ return {
},
children = { {
id = "vehicle/train/ep20/ep20.msh",
transf = {
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, -0.04, 1,
},
type = "MESH",
}, {
id = "vehicle/train/ep20_pntgrphs.grp",
id = "vehicle/train/EP20.grp",
transf = {
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1,
},
type = "GROUP",
}, {
id = "vehicle/train/ep20.grp",
},{
id = "vehicle/train/EP20/EP20_Light.msh",
transf = {
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 6.62, 0, -0.04, 1,
},
type = "GROUP",
}, {
id = "vehicle/train/ep20.grp",
transf = {
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -6.62, 0, -0.04, 1,
},
type = "GROUP",
}, {
id = "vehicle/train/ep20.grp",
transf = {
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, -0.04, 1,
},
type = "GROUP",
}, {
id = "vehicle/train/ep20/ep20_light.msh",
transf = {
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.001, 0, -0.04, 1,
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.01, 0, 0, 1,
},
type = "MESH",
@ -66,29 +39,17 @@ return {
},
events = {
open_all_doors = {
[6] = { name = "open_doors", forward = true },
},
close_all_doors = {
[6] = { name = "open_doors", forward = false },
},
open_doors_left = {
[6] = { name = "open_doors", forward = true },
},
close_doors_left = {
[6] = { name = "open_doors", forward = false },
},
open_doors_right = {
[6] = { name = "open_doors", forward = true },
},
close_doors_right = {
[6] = { name = "open_doors", forward = false },
},
},
events = {
open_all_doors = {
[2] = { name = "open_doors", forward = true },
},
close_all_doors = {
[2] = { name = "open_doors", forward = false },
},
},
matConfigs = {
{
0, 0, 0, 0, 0, 0,
0, 0,
},
},
static = false,
@ -99,7 +60,7 @@ return {
},
metadata = {
description = {
name = _("ЭП20"),
name = _("ЭП20(200)"),
description = _(
"Российский двухсистемный скоростной шестиосный\n" ..
"пассажирский электровоз, спроектированный\n" ..
@ -117,11 +78,11 @@ return {
configs = {
{
axles = {
"vehicle/train/ep20/ep20_wheels.msh",
"vehicle/train/EP20/EP20_Wheels.msh",
}
}
},
soundSet = { name = "ep20", horn = "vehicle/ep20horn.wav" }
soundSet = { name = "EP20", horn = "vehicle/EP20_Horn.wav" }
},
transportVehicle = {
carrier = "RAIL"
@ -131,7 +92,7 @@ return {
-- yearTo = 0
},
cost = {
price = 1624000
price = 100
},
maintenance = {
runningCosts = 830000,

View File

@ -0,0 +1,107 @@
function data()
return {
boundingInfo = {
bbMax = {
11.0635, 1.75148, 5.89676,
},
bbMin = {
-11.0635, -1.8037, -0.0692888,
},
},
collider = {
params = {
},
type = "MESH",
},
lods = {
{
animations = {
},
children = { {
id = "vehicle/train/EP20_020.grp",
transf = {
-1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1,
},
type = "GROUP",
},{
id = "vehicle/train/EP20/EP20_Light.msh",
transf = {
1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.01, 0, 0, 1,
},
type = "MESH",
},
},
events = {
open_all_doors = {
[2] = { name = "open_doors", forward = true },
},
close_all_doors = {
[2] = { name = "open_doors", forward = false },
},
},
matConfigs = {
{
0, 0,
},
},
static = false,
visibleFrom = 0,
visibleTo = 2100,
},
},
metadata = {
description = {
name = _("ЭП20(160)"),
description = _(
"Российский двухсистемный скоростной шестиосный\n" ..
"пассажирский электровоз, спроектированный\n" ..
"Трансмашхолдингом с использованием ряда\n" ..
"технических решений французской компании Alstom.\n" ..
"Серийно выпускается на\n" ..
"Новочеркасском Электровозостроительном Заводе.")
},
railVehicle = {
topSpeed = 160.0,
weight = 129.0,
engines = {
{ type = "ELECTRIC", power = 6600.0, tractiveEffort = 450.0 }
},
configs = {
{
axles = {
"vehicle/train/EP20/EP20_Wheels.msh",
}
}
},
soundSet = { name = "EP20", horn = "vehicle/EP20_Horn.wav" }
},
transportVehicle = {
carrier = "RAIL"
},
availability = {
yearFrom = 2011,
-- yearTo = 0
},
cost = {
price = 100
},
maintenance = {
runningCosts = 830000,
lifespan = 50
},
},
}
end
CostIndex = U;

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 MiB

After

Width:  |  Height:  |  Size: 16 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 256 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 MiB

After

Width:  |  Height:  |  Size: 16 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB