mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 13:09:52 +02:00
switch emits
This commit is contained in:
parent
cf8d4aa993
commit
3ee41404f7
3 changed files with 30 additions and 13 deletions
|
@ -86,8 +86,6 @@
|
||||||
var data = {
|
var data = {
|
||||||
"Texture.001": "atp:/Tidyguy-7.fbx/Tidyguy-7.fbm/Head-Housing-Texture.png",
|
"Texture.001": "atp:/Tidyguy-7.fbx/Tidyguy-7.fbm/Head-Housing-Texture.png",
|
||||||
"button.tidy": "atp:/Tidyguy-7.fbx/Tidyguy-7.fbm/Tidy-Up-Button-Green.png",
|
"button.tidy": "atp:/Tidyguy-7.fbx/Tidyguy-7.fbm/Tidy-Up-Button-Green.png",
|
||||||
"button.tidy-active": "atp:/Tidyguy-7.fbx/Tidyguy-7.fbm/Tidy-Up-Button-Orange.png",
|
|
||||||
"button.tidy-active.emit": "atp:/Tidyguy-7.fbx/Tidyguy-7.fbm/Tidy-Up-Button-Orange-Emit.png",
|
|
||||||
"button.tidy.emit": "atp:/Tidyguy-7.fbx/Tidyguy-7.fbm/Tidy-Up-Button-Green-Emit.png",
|
"button.tidy.emit": "atp:/Tidyguy-7.fbx/Tidyguy-7.fbm/Tidy-Up-Button-Green-Emit.png",
|
||||||
"tex.button.blanks": "atp:/Tidyguy-7.fbx/Tidyguy-7.fbm/Button-Blanks.png",
|
"tex.button.blanks": "atp:/Tidyguy-7.fbx/Tidyguy-7.fbm/Button-Blanks.png",
|
||||||
"tex.button.blanks.normal": "atp:/Tidyguy-7.fbx/Tidyguy-7.fbm/Button-Blanks-Normal.png",
|
"tex.button.blanks.normal": "atp:/Tidyguy-7.fbx/Tidyguy-7.fbm/Button-Blanks-Normal.png",
|
||||||
|
|
|
@ -28,22 +28,28 @@
|
||||||
modelEmitOn: function(glowDisc) {
|
modelEmitOn: function(glowDisc) {
|
||||||
|
|
||||||
var data = {
|
var data = {
|
||||||
"Metal-brushed-light.jpg": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/Metal-brushed-light.jpg",
|
"Metal-brushed-light.jpg": "atp:/models/Lights-Dressing-Room-3.fbx/Lights-Dressing-Room-3.fbm/Metal-brushed-light.jpg",
|
||||||
"Tex.CeilingLight.Emit": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-On-Diffuse.jpg",
|
"Tex.CeilingLight-Diffuse": "atp:/models/Lights-Dressing-Room-3.fbx/Lights-Dressing-Room-3.fbm/CielingLight-Base.jpg",
|
||||||
"TexCeilingLight.Diffuse": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-Base.jpg"
|
"Tex.CeilingLight-Emit": "atp:/models/Lights-Dressing-Room-3.fbx/Lights-Dressing-Room-3.fbm/CielingLight-On-Diffuse.jpg"
|
||||||
};
|
}
|
||||||
Entities.editEntity(glowDisc, JSON.stringify(data));
|
|
||||||
|
Entities.editEntity(glowDisc, {
|
||||||
|
textures: JSON.stringify(data)
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
modelEmitOff: function(glowDisc) {
|
modelEmitOff: function(glowDisc) {
|
||||||
|
|
||||||
var data = {
|
var data = {
|
||||||
"Metal-brushed-light.jpg": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/Metal-brushed-light.jpg",
|
"Metal-brushed-light.jpg": "atp:/models/Lights-Dressing-Room-3.fbx/Lights-Dressing-Room-3.fbm/Metal-brushed-light.jpg",
|
||||||
"Tex.CeilingLight.Emit": "",
|
"Tex.CeilingLight-Diffuse": "atp:/models/Lights-Dressing-Room-3.fbx/Lights-Dressing-Room-3.fbm/CielingLight-Base.jpg",
|
||||||
"TexCeilingLight.Diffuse": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-Base.jpg"
|
"Tex.CeilingLight-Emit": ""
|
||||||
}
|
}
|
||||||
|
|
||||||
Entities.editEntity(glowDisc, JSON.stringify(data));
|
|
||||||
|
Entities.editEntity(glowDisc, {
|
||||||
|
textures: JSON.stringify(data)
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
masterLightOn: function(masterLight) {
|
masterLightOn: function(masterLight) {
|
||||||
|
|
|
@ -24,14 +24,27 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
modelEmitOn: function(glowDisc) {
|
modelEmitOn: function(glowDisc) {
|
||||||
|
var data = {
|
||||||
|
"Metal-brushed-light.jpg": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/Metal-brushed-light.jpg",
|
||||||
|
"Tex.CeilingLight.Emit": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-On-Diffuse.jpg",
|
||||||
|
"TexCeilingLight.Diffuse": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-Base.jpg"
|
||||||
|
}
|
||||||
|
|
||||||
Entities.editEntity(glowDisc, {
|
Entities.editEntity(glowDisc, {
|
||||||
textures: 'Metal-brushed-light.jpg:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/Metal-brushed-light.jpg",\nTex.CeilingLight.Emit:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-On-Diffuse.jpg",\nTexCeilingLight.Diffuse:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-Base.jpg"'
|
textures: JSON.stringify(data)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
modelEmitOff: function(glowDisc) {
|
modelEmitOff: function(glowDisc) {
|
||||||
|
var data = {
|
||||||
|
"Metal-brushed-light.jpg": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/Metal-brushed-light.jpg",
|
||||||
|
"Tex.CeilingLight.Emit": "atp:/models/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-On-Diffuse.jpg",
|
||||||
|
"TexCeilingLight.Diffuse": ""
|
||||||
|
}
|
||||||
|
|
||||||
Entities.editEntity(glowDisc, {
|
Entities.editEntity(glowDisc, {
|
||||||
textures: 'Metal-brushed-light.jpg:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/Metal-brushed-light.jpg",\nTex.CeilingLight.Emit:"",\nTexCeilingLight.Diffuse:"https://s3-us-west-1.amazonaws.com/hifi-content/alan/dev/Lights-Living-Room-2.fbx/Lights-Living-Room-2.fbm/CielingLight-Base.jpg"'
|
textures: JSON.stringify(data)
|
||||||
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue