Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:20:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11788 from ctrlaltdavid/21579-a

Browse source 
Particles emitter fixes
This commit is contained in:
Andrew Meadows 2017-11-17 11:31:12 -08:00 committed by GitHub
commit 98001b64d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities/src/ParticleEffectEntityItem.cpp
View file

@ -97,7 +97,8 @@ bool operator==(const Properties& a, const Properties& b) {
(a.maxParticles == b.maxParticles) && (a.maxParticles == b.maxParticles) &&
(a.emission == b.emission) && (a.emission == b.emission) &&
(a.polar == b.polar) && (a.polar == b.polar) &&
(a.azimuth == b.azimuth); (a.azimuth == b.azimuth) &&
(a.textures == b.textures);
} }
bool operator!=(const Properties& a, const Properties& b) { bool operator!=(const Properties& a, const Properties& b) {

11
scripts/system/particle_explorer/hifi-entity-ui.js
View file

@ -482,14 +482,23 @@ HifiEntityUI.prototype = {
textureImage.className = "texture-image no-texture"; textureImage.className = "texture-image no-texture";
var image = document.createElement("img"); var image = document.createElement("img");
var imageLoad = _.debounce(function (url) { var imageLoad = _.debounce(function (url) {
if (url.length > 0) { if (url.slice(0, 5).toLowerCase() === "atp:/") {
image.src = "";
image.style.display = "none";
textureImage.classList.remove("with-texture");
textureImage.classList.remove("no-texture"); textureImage.classList.remove("no-texture");
textureImage.classList.add("no-preview");
} else if (url.length > 0) {
textureImage.classList.remove("no-texture");
textureImage.classList.remove("no-preview");
textureImage.classList.add("with-texture"); textureImage.classList.add("with-texture");
image.src = url; image.src = url;
image.style.display = "block"; image.style.display = "block";
} else { } else {
image.src = ""; image.src = "";
image.style.display = "none"; image.style.display = "none";
textureImage.classList.remove("with-texture");
textureImage.classList.remove("no-preview");
textureImage.classList.add("no-texture"); textureImage.classList.add("no-texture");
} }
self.webBridgeSync(group.id, url); self.webBridgeSync(group.id, url);

6
scripts/system/particle_explorer/particle-style.css
View file

File diff suppressed because one or more lines are too long