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.

Sign up for GitHub

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

Jump to bottom

Add gobo resource handling #1185

Merged
merged 26 commits into from
Feb 11, 2020
Merged

Add gobo resource handling #1185

merged 26 commits into from
Feb 11, 2020

Conversation

FloEdelmann
Copy link
Member

@FloEdelmann FloEdelmann commented Jan 30, 2020 •
edited
Loading

Closes #1181.

  • Update the schema
  • Add some gobos to fixtures to test the feature
  • Display gobos on fixture pages
  • Support gobos in plugins
    • QLC+ 4.12.1 (import/export + export tests)
    • ColorSource (export)
    • GDTF (import)
  • Add tests
    • res points to a valid resource file
    • There exists a corresponding SVG/PNG for a given gobo resource
  • Add documentation

@FloEdelmann FloEdelmann added component-test Affects the automated tests. component-ui Affects the user interface on the open-fixture-library.org website. component-fixture Affects one or more existing fixture definitions. component-plugin Affects one or more import or export plugins. component-model Affects the fixture model ES classes. component-schema Affects the fixture JSON schema. labels Jan 30, 2020
@FloEdelmann

This comment has been minimized.

Sign in to view
@FloEdelmann FloEdelmann temporarily deployed to ofl-gobo-resources-4vpjhyet6ys January 30, 2020 18:55 Inactive
@FloEdelmann FloEdelmann mentioned this pull request Jan 30, 2020
Merged
@FloEdelmann FloEdelmann temporarily deployed to ofl-gobo-resources-4vpjhyet6ys January 30, 2020 21:49 Inactive
@FloEdelmann

This comment has been minimized.

Sign in to view
@FloEdelmann FloEdelmann temporarily deployed to ofl-gobo-resources-4vpjhyet6ys January 31, 2020 08:23 Inactive
@FloEdelmann FloEdelmann marked this pull request as ready for review January 31, 2020 08:23
@FloEdelmann FloEdelmann temporarily deployed to ofl-gobo-resources-4vpjhyet6ys January 31, 2020 08:28 Inactive
@FloEdelmann FloEdelmann temporarily deployed to ofl-gobo-resources-4vpjhyet6ys January 31, 2020 09:18 Inactive
fxedel
fxedel requested changes Jan 31, 2020
View reviewed changes
lib/model.js Outdated Show resolved Hide resolved
lib/model.js Outdated Show resolved Hide resolved
lib/model.js Outdated Show resolved Hide resolved
lib/model/WheelSlot.js Outdated Show resolved Hide resolved
lib/model.js Outdated Show resolved Hide resolved
plugins/qlcplus_4.12.1/presets.js
if (resource) {
const qlcplusGoboAlias = Object.keys(qlcplusGoboAliases).find(
alias => qlcplusGoboAliases[alias] === resource.key
);
Copy link
Member

Choose a reason for hiding this comment

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

If we created the reverse map in advance, performance could be increased when exporting a lot of gobo fixtures.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think this is out of scope of this PR. We can surely pick this up in the future when we see performance hits.

plugins/qlcplus_4.12.1/exportTests/fixture-tool-validation.js Outdated Show resolved Hide resolved
plugins/qlcplus_4.12.1/exportTests/fixture-tool-validation.js Show resolved Hide resolved
plugins/qlcplus_4.12.1/export.js Outdated Show resolved Hide resolved
@FloEdelmann FloEdelmann temporarily deployed to ofl-gobo-resources-4vpjhyet6ys February 1, 2020 11:13 Inactive
@FloEdelmann FloEdelmann temporarily deployed to ofl-gobo-resources-4vpjhyet6ys February 3, 2020 18:18 Inactive
fxedel
fxedel requested changes Feb 6, 2020
View reviewed changes
Copy link
Member

@fxedel fxedel left a comment

Choose a reason for hiding this comment

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

The new Resource class makes some parts of the code much cleaner!

lib/model.js Outdated Show resolved Hide resolved
lib/model/Resource.js Outdated Show resolved Hide resolved
lib/model/Resource.js Outdated Show resolved Hide resolved
lib/model/Resource.js Outdated Show resolved Hide resolved
lib/model/Resource.js Outdated Show resolved Hide resolved
fxedel
fxedel approved these changes Feb 11, 2020
View reviewed changes
Copy link
Member

@fxedel fxedel left a comment

Choose a reason for hiding this comment

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

🎉

@FloEdelmann
Copy link
Member Author

Plugin export diff

(Output of test script tests/github/export-diff.js.)

You can view your uncommitted changes in plugin exports manually by executing:
$ node cli/diff-plugin-outputs.js -p <plugin-key> [-c <compare-plugin-key>] <fixtures>

💤 afx/lmh460z: colorsource Outputted files not changed.
💤 afx/lmh460z: d-light Outputted files not changed.
💤 afx/lmh460z: ecue Outputted files not changed.
💤 afx/lmh460z: millumin Outputted files not changed.
💤 afx/lmh460z: op-z Outputted files not changed.
💤 afx/lmh460z: qlcplus_4.12.1 Outputted files not changed.
💤 astera/fp1-titan-tube: colorsource Outputted files not changed.
💤 astera/fp1-titan-tube: d-light Outputted files not changed.
💤 astera/fp1-titan-tube: ecue Outputted files not changed.
💤 astera/fp1-titan-tube: millumin Outputted files not changed.
💤 astera/fp1-titan-tube: op-z Outputted files not changed.
💤 astera/fp1-titan-tube: qlcplus_4.12.1 Outputted files not changed.
💤 ayrton/magicblade-fx: colorsource Outputted files not changed.
💤 ayrton/magicblade-fx: d-light Outputted files not changed.
💤 ayrton/magicblade-fx: ecue Outputted files not changed.
💤 ayrton/magicblade-fx: millumin Outputted files not changed.
💤 ayrton/magicblade-fx: op-z Outputted files not changed.
💤 ayrton/magicblade-fx: qlcplus_4.12.1 Outputted files not changed.
💤 cameo/auro-spot-400: colorsource Outputted files not changed.
💤 cameo/auro-spot-400: d-light Outputted files not changed.
💤 cameo/auro-spot-400: ecue Outputted files not changed.
💤 cameo/auro-spot-400: millumin Outputted files not changed.
💤 cameo/auro-spot-400: op-z Outputted files not changed.
💤 cameo/auro-spot-400: qlcplus_4.12.1 Outputted files not changed.
💤 cameo/hydrabeam-300-rgbw: colorsource Outputted files not changed.
💤 cameo/hydrabeam-300-rgbw: d-light Outputted files not changed.
💤 cameo/hydrabeam-300-rgbw: ecue Outputted files not changed.
💤 cameo/hydrabeam-300-rgbw: millumin Outputted files not changed.
💤 cameo/hydrabeam-300-rgbw: op-z Outputted files not changed.
💤 cameo/hydrabeam-300-rgbw: qlcplus_4.12.1 Outputted files not changed.
💤 flash-professional/led-moving-head-150w: colorsource Outputted files not changed.
💤 flash-professional/led-moving-head-150w: d-light Outputted files not changed.
💤 flash-professional/led-moving-head-150w: ecue Outputted files not changed.
💤 flash-professional/led-moving-head-150w: millumin Outputted files not changed.
💤 flash-professional/led-moving-head-150w: op-z Outputted files not changed.
💤 flash-professional/led-moving-head-150w: qlcplus_4.12.1 Outputted files not changed.
💤 generic/pan-tilt: colorsource Outputted files not changed.
💤 generic/pan-tilt: d-light Outputted files not changed.
💤 generic/pan-tilt: ecue Outputted files not changed.
💤 generic/pan-tilt: millumin Outputted files not changed.
💤 generic/pan-tilt: op-z Outputted files not changed.
💤 generic/pan-tilt: qlcplus_4.12.1 Outputted files not changed.
💤 glp/impression-laser: colorsource Outputted files not changed.
💤 glp/impression-laser: d-light Outputted files not changed.
💤 glp/impression-laser: ecue Outputted files not changed.
💤 glp/impression-laser: millumin Outputted files not changed.
💤 glp/impression-laser: op-z Outputted files not changed.
💤 glp/impression-laser: qlcplus_4.12.1 Outputted files not changed.
💤 glp/knv-arc: colorsource Outputted files not changed.
💤 glp/knv-arc: d-light Outputted files not changed.
💤 glp/knv-arc: ecue Outputted files not changed.
💤 glp/knv-arc: millumin Outputted files not changed.
💤 glp/knv-arc: op-z Outputted files not changed.
💤 glp/knv-arc: qlcplus_4.12.1 Outputted files not changed.
💤 lixada/mini-moving-head-rgbw: colorsource Outputted files not changed.
💤 lixada/mini-moving-head-rgbw: d-light Outputted files not changed.
💤 lixada/mini-moving-head-rgbw: ecue Outputted files not changed.
💤 lixada/mini-moving-head-rgbw: millumin Outputted files not changed.
💤 lixada/mini-moving-head-rgbw: op-z Outputted files not changed.
💤 lixada/mini-moving-head-rgbw: qlcplus_4.12.1 Outputted files not changed.
💤 martin/mac-axiom-hybrid: colorsource Outputted files not changed.
💤 martin/mac-axiom-hybrid: d-light Outputted files not changed.
💤 martin/mac-axiom-hybrid: ecue Outputted files not changed.
💤 martin/mac-axiom-hybrid: millumin Outputted files not changed.
💤 martin/mac-axiom-hybrid: op-z Outputted files not changed.
💤 martin/mac-axiom-hybrid: qlcplus_4.12.1 Outputted files not changed.
💤 martin/mac-encore-performance: colorsource Outputted files not changed.
💤 martin/mac-encore-performance: d-light Outputted files not changed.
💤 martin/mac-encore-performance: ecue Outputted files not changed.
💤 martin/mac-encore-performance: millumin Outputted files not changed.
💤 martin/mac-encore-performance: op-z Outputted files not changed.
💤 martin/mac-encore-performance: qlcplus_4.12.1 Outputted files not changed.
💤 martin/mania-scx500: colorsource Outputted files not changed.
💤 martin/mania-scx500: d-light Outputted files not changed.
💤 martin/mania-scx500: ecue Outputted files not changed.
💤 martin/mania-scx500: millumin Outputted files not changed.
💤 martin/mania-scx500: op-z Outputted files not changed.
💤 martin/mania-scx500: qlcplus_4.12.1 Outputted files not changed.
💤 mdg/theone-atmospheric-generator: colorsource Outputted files not changed.
💤 mdg/theone-atmospheric-generator: d-light Outputted files not changed.
💤 mdg/theone-atmospheric-generator: ecue Outputted files not changed.
💤 mdg/theone-atmospheric-generator: millumin Outputted files not changed.
💤 mdg/theone-atmospheric-generator: op-z Outputted files not changed.
💤 mdg/theone-atmospheric-generator: qlcplus_4.12.1 Outputted files not changed.
💤 prolights/diamond19: colorsource Outputted files not changed.
💤 prolights/diamond19: d-light Outputted files not changed.
💤 prolights/diamond19: ecue Outputted files not changed.
💤 prolights/diamond19: millumin Outputted files not changed.
💤 prolights/diamond19: op-z Outputted files not changed.
💤 prolights/diamond19: qlcplus_4.12.1 Outputted files not changed.
💤 qtx/lux-ld01: colorsource Outputted files not changed.
💤 qtx/lux-ld01: d-light Outputted files not changed.
💤 qtx/lux-ld01: ecue Outputted files not changed.
💤 qtx/lux-ld01: millumin Outputted files not changed.
💤 qtx/lux-ld01: op-z Outputted files not changed.
💤 qtx/lux-ld01: qlcplus_4.12.1 Outputted files not changed.
💤 robe/robin-600e-spot: colorsource Outputted files not changed.
💤 robe/robin-600e-spot: d-light Outputted files not changed.
💤 robe/robin-600e-spot: ecue Outputted files not changed.
💤 robe/robin-600e-spot: millumin Outputted files not changed.
💤 robe/robin-600e-spot: op-z Outputted files not changed.
💤 robe/robin-600e-spot: qlcplus_4.12.1 Outputted files not changed.
🆚 showtec/phantom-50-led-spot: colorsource
Changed outputted file userlib.jlib 
--- removed
+++ added
@@ -326,87 +326,87 @@
             {
               "begin": 8,
               "default": 8,
               "end": 15,
-              "label": "Gobo 1 Glass"
+              "label": "Gobo Red with 10 circles"
             },
             {
               "begin": 16,
               "default": 16,
               "end": 23,
-              "label": "Gobo 2 Glass"
+              "label": "Gobo Raindrops on window"
             },
             {
               "begin": 24,
               "default": 24,
               "end": 31,
-              "label": "Gobo 3 Metal"
+              "label": "Gobo Swirl"
             },
             {
               "begin": 32,
               "default": 32,
               "end": 39,
-              "label": "Gobo 4 Metal"
+              "label": "Gobo Biohazard"
             },
             {
               "begin": 40,
               "default": 40,
               "end": 47,
-              "label": "Gobo 5 Metal"
+              "label": "Gobo Rose petal"
             },
             {
               "begin": 48,
               "default": 48,
               "end": 55,
-              "label": "Gobo 6 Metal"
+              "label": "Gobo Triangle/hexagon pattern"
             },
             {
               "begin": 56,
               "default": 56,
               "end": 63,
-              "label": "Gobo 7 Metal"
+              "label": "Gobo Dot spiral"
             },
             {
               "begin": 64,
               "default": 67,
               "end": 71,
-              "label": "Gobo 7 Metal shake slow…fast"
+              "label": "Gobo Dot spiral shake slow…fast"
             },
             {
               "begin": 72,
               "default": 75,
               "end": 79,
-              "label": "Gobo 6 Metal shake slow…fast"
+              "label": "Gobo Triangle/hexagon pattern shake slow…fast"
             },
             {
               "begin": 80,
               "default": 83,
               "end": 87,
-              "label": "Gobo 5 Metal shake slow…fast"
+              "label": "Gobo Rose petal shake slow…fast"
             },
             {
               "begin": 88,
               "default": 91,
               "end": 95,
-              "label": "Gobo 4 Metal shake slow…fast"
+              "label": "Gobo Biohazard shake slow…fast"
             },
             {
               "begin": 96,
               "default": 99,
               "end": 103,
-              "label": "Gobo 3 Metal shake slow…fast"
+              "label": "Gobo Swirl shake slow…fast"
             },
             {
               "begin": 104,
               "default": 107,
               "end": 111,
-              "label": "Gobo 2 Glass shake slow…fast"
+              "label": "Gobo Raindrops on window shake slow…fast"
             },
             {
               "begin": 112,
               "default": 115,
               "end": 119,
-              "label": "Gobo 1 Glass shake slow…fast"
+              "label": "Gobo Red with 10 circles shake slow…fast"
             },
             {
               "begin": 120,
               "default": 120,
@@ -1020,87 +1020,87 @@
             {
               "begin": 8,
               "default": 8,
               "end": 15,
-              "label": "Gobo 1 Glass"
+              "label": "Gobo Red with 10 circles"
             },
             {
               "begin": 16,
               "default": 16,
               "end": 23,
-              "label": "Gobo 2 Glass"
+              "label": "Gobo Raindrops on window"
             },
             {
               "begin": 24,
               "default": 24,
               "end": 31,
-              "label": "Gobo 3 Metal"
+              "label": "Gobo Swirl"
             },
             {
               "begin": 32,
               "default": 32,
               "end": 39,
-              "label": "Gobo 4 Metal"
+              "label": "Gobo Biohazard"
             },
             {
               "begin": 40,
               "default": 40,
               "end": 47,
-              "label": "Gobo 5 Metal"
+              "label": "Gobo Rose petal"
             },
             {
               "begin": 48,
               "default": 48,
               "end": 55,
-              "label": "Gobo 6 Metal"
+              "label": "Gobo Triangle/hexagon pattern"
             },
             {
               "begin": 56,
               "default": 56,
               "end": 63,
-              "label": "Gobo 7 Metal"
+              "label": "Gobo Dot spiral"
             },
             {
               "begin": 64,
               "default": 67,
               "end": 71,
-              "label": "Gobo 7 Metal shake slow…fast"
+              "label": "Gobo Dot spiral shake slow…fast"
             },
             {
               "begin": 72,
               "default": 75,
               "end": 79,
-              "label": "Gobo 6 Metal shake slow…fast"
+              "label": "Gobo Triangle/hexagon pattern shake slow…fast"
             },
             {
               "begin": 80,
               "default": 83,
               "end": 87,
-              "label": "Gobo 5 Metal shake slow…fast"
+              "label": "Gobo Rose petal shake slow…fast"
             },
             {
               "begin": 88,
               "default": 91,
               "end": 95,
-              "label": "Gobo 4 Metal shake slow…fast"
+              "label": "Gobo Biohazard shake slow…fast"
             },
             {
               "begin": 96,
               "default": 99,
               "end": 103,
-              "label": "Gobo 3 Metal shake slow…fast"
+              "label": "Gobo Swirl shake slow…fast"
             },
             {
               "begin": 104,
               "default": 107,
               "end": 111,
-              "label": "Gobo 2 Glass shake slow…fast"
+              "label": "Gobo Raindrops on window shake slow…fast"
             },
             {
               "begin": 112,
               "default": 115,
               "end": 119,
-              "label": "Gobo 1 Glass shake slow…fast"
+              "label": "Gobo Red with 10 circles shake slow…fast"
             },
             {
               "begin": 120,
               "default": 120,
🆚 showtec/phantom-50-led-spot: d-light
Changed outputted file showtec/phantom-50-led-spot-13ch.xml 
--- removed
+++ added
@@ -102,22 +102,22 @@
         <minLevel id="0"/>
         <maxLevel id="255"/>
         <Definitions index="18">
           <name min="0" max="7" snap="0" timeHolder="0" dummy="0">Open</name>
-          <name min="8" max="15" snap="8" timeHolder="0" dummy="0">Gobo 1 Glass</name>
-          <name min="16" max="23" snap="16" timeHolder="0" dummy="0">Gobo 2 Glass</name>
-          <name min="24" max="31" snap="24" timeHolder="0" dummy="0">Gobo 3 Metal</name>
-          <name min="32" max="39" snap="32" timeHolder="0" dummy="0">Gobo 4 Metal</name>
-          <name min="40" max="47" snap="40" timeHolder="0" dummy="0">Gobo 5 Metal</name>
-          <name min="48" max="55" snap="48" timeHolder="0" dummy="0">Gobo 6 Metal</name>
-          <name min="56" max="63" snap="56" timeHolder="0" dummy="0">Gobo 7 Metal</name>
-          <name min="64" max="71" snap="67" timeHolder="0" dummy="0">Gobo 7 Metal shake slow…fast</name>
-          <name min="72" max="79" snap="75" timeHolder="0" dummy="0">Gobo 6 Metal shake slow…fast</name>
-          <name min="80" max="87" snap="83" timeHolder="0" dummy="0">Gobo 5 Metal shake slow…fast</name>
-          <name min="88" max="95" snap="91" timeHolder="0" dummy="0">Gobo 4 Metal shake slow…fast</name>
-          <name min="96" max="103" snap="99" timeHolder="0" dummy="0">Gobo 3 Metal shake slow…fast</name>
-          <name min="104" max="111" snap="107" timeHolder="0" dummy="0">Gobo 2 Glass shake slow…fast</name>
-          <name min="112" max="119" snap="115" timeHolder="0" dummy="0">Gobo 1 Glass shake slow…fast</name>
+          <name min="8" max="15" snap="8" timeHolder="0" dummy="0">Gobo Red with 10 circles</name>
+          <name min="16" max="23" snap="16" timeHolder="0" dummy="0">Gobo Raindrops on window</name>
+          <name min="24" max="31" snap="24" timeHolder="0" dummy="0">Gobo Swirl</name>
+          <name min="32" max="39" snap="32" timeHolder="0" dummy="0">Gobo Biohazard</name>
+          <name min="40" max="47" snap="40" timeHolder="0" dummy="0">Gobo Rose petal</name>
+          <name min="48" max="55" snap="48" timeHolder="0" dummy="0">Gobo Triangle/hexagon pattern</name>
+          <name min="56" max="63" snap="56" timeHolder="0" dummy="0">Gobo Dot spiral</name>
+          <name min="64" max="71" snap="67" timeHolder="0" dummy="0">Gobo Dot spiral shake slow…fast</name>
+          <name min="72" max="79" snap="75" timeHolder="0" dummy="0">Gobo Triangle/hexagon pattern shake slow…fast</name>
+          <name min="80" max="87" snap="83" timeHolder="0" dummy="0">Gobo Rose petal shake slow…fast</name>
+          <name min="88" max="95" snap="91" timeHolder="0" dummy="0">Gobo Biohazard shake slow…fast</name>
+          <name min="96" max="103" snap="99" timeHolder="0" dummy="0">Gobo Swirl shake slow…fast</name>
+          <name min="104" max="111" snap="107" timeHolder="0" dummy="0">Gobo Raindrops on window shake slow…fast</name>
+          <name min="112" max="119" snap="115" timeHolder="0" dummy="0">Gobo Red with 10 circles shake slow…fast</name>
           <name min="120" max="127" snap="120" timeHolder="0" dummy="0">Open</name>
           <name min="128" max="191" snap="159" timeHolder="0" dummy="0">Gobo Wheel rotation CW slow…fast</name>
           <name min="192" max="255" snap="223" timeHolder="0" dummy="0">Gobo Wheel rotation CCW slow…fast</name>
         </Definitions>
Changed outputted file showtec/phantom-50-led-spot-8ch.xml 
--- removed
+++ added
@@ -92,22 +92,22 @@
         <minLevel id="0"/>
         <maxLevel id="255"/>
         <Definitions index="18">
           <name min="0" max="7" snap="0" timeHolder="0" dummy="0">Open</name>
-          <name min="8" max="15" snap="8" timeHolder="0" dummy="0">Gobo 1 Glass</name>
-          <name min="16" max="23" snap="16" timeHolder="0" dummy="0">Gobo 2 Glass</name>
-          <name min="24" max="31" snap="24" timeHolder="0" dummy="0">Gobo 3 Metal</name>
-          <name min="32" max="39" snap="32" timeHolder="0" dummy="0">Gobo 4 Metal</name>
-          <name min="40" max="47" snap="40" timeHolder="0" dummy="0">Gobo 5 Metal</name>
-          <name min="48" max="55" snap="48" timeHolder="0" dummy="0">Gobo 6 Metal</name>
-          <name min="56" max="63" snap="56" timeHolder="0" dummy="0">Gobo 7 Metal</name>
-          <name min="64" max="71" snap="67" timeHolder="0" dummy="0">Gobo 7 Metal shake slow…fast</name>
-          <name min="72" max="79" snap="75" timeHolder="0" dummy="0">Gobo 6 Metal shake slow…fast</name>
-          <name min="80" max="87" snap="83" timeHolder="0" dummy="0">Gobo 5 Metal shake slow…fast</name>
-          <name min="88" max="95" snap="91" timeHolder="0" dummy="0">Gobo 4 Metal shake slow…fast</name>
-          <name min="96" max="103" snap="99" timeHolder="0" dummy="0">Gobo 3 Metal shake slow…fast</name>
-          <name min="104" max="111" snap="107" timeHolder="0" dummy="0">Gobo 2 Glass shake slow…fast</name>
-          <name min="112" max="119" snap="115" timeHolder="0" dummy="0">Gobo 1 Glass shake slow…fast</name>
+          <name min="8" max="15" snap="8" timeHolder="0" dummy="0">Gobo Red with 10 circles</name>
+          <name min="16" max="23" snap="16" timeHolder="0" dummy="0">Gobo Raindrops on window</name>
+          <name min="24" max="31" snap="24" timeHolder="0" dummy="0">Gobo Swirl</name>
+          <name min="32" max="39" snap="32" timeHolder="0" dummy="0">Gobo Biohazard</name>
+          <name min="40" max="47" snap="40" timeHolder="0" dummy="0">Gobo Rose petal</name>
+          <name min="48" max="55" snap="48" timeHolder="0" dummy="0">Gobo Triangle/hexagon pattern</name>
+          <name min="56" max="63" snap="56" timeHolder="0" dummy="0">Gobo Dot spiral</name>
+          <name min="64" max="71" snap="67" timeHolder="0" dummy="0">Gobo Dot spiral shake slow…fast</name>
+          <name min="72" max="79" snap="75" timeHolder="0" dummy="0">Gobo Triangle/hexagon pattern shake slow…fast</name>
+          <name min="80" max="87" snap="83" timeHolder="0" dummy="0">Gobo Rose petal shake slow…fast</name>
+          <name min="88" max="95" snap="91" timeHolder="0" dummy="0">Gobo Biohazard shake slow…fast</name>
+          <name min="96" max="103" snap="99" timeHolder="0" dummy="0">Gobo Swirl shake slow…fast</name>
+          <name min="104" max="111" snap="107" timeHolder="0" dummy="0">Gobo Raindrops on window shake slow…fast</name>
+          <name min="112" max="119" snap="115" timeHolder="0" dummy="0">Gobo Red with 10 circles shake slow…fast</name>
           <name min="120" max="127" snap="120" timeHolder="0" dummy="0">Open</name>
           <name min="128" max="191" snap="159" timeHolder="0" dummy="0">Gobo Wheel rotation CW slow…fast</name>
           <name min="192" max="255" snap="223" timeHolder="0" dummy="0">Gobo Wheel rotation CCW slow…fast</name>
         </Definitions>
🆚 showtec/phantom-50-led-spot: ecue
Changed outputted file UserLibrary.xml 
--- removed
+++ added
@@ -2,9 +2,9 @@
 <Document Owner="user" TypeVersion="2" SaveTimeStamp="2020-02-11#15:28:03">
     <Library>
         <Fixtures>
             <Manufacturer _CreationDate="2020-02-11#15:28:03" _ModifiedDate="2020-02-11#15:28:03" Name="Showtec" Comment="" Web="https://www.highlite.com/">
-                <Fixture _CreationDate="2017-04-29#00:00:00" _ModifiedDate="2018-09-04#00:00:00" Name="Phantom 50 LED Spot (13ch mode)" NameShort="Phant50-13ch" Comment="Ordercode 40187 (generated by the Open Fixture Library – https://open-fixture-library.org/showtec/phantom-50-led-spot)" AllocateDmxChannels="13" Weight="5.64" Power="185" DimWidth="225" DimHeight="340" DimDepth="210">
+                <Fixture _CreationDate="2017-04-29#00:00:00" _ModifiedDate="2020-02-11#00:00:00" Name="Phantom 50 LED Spot (13ch mode)" NameShort="Phant50-13ch" Comment="Ordercode 40187 (generated by the Open Fixture Library – https://open-fixture-library.org/showtec/phantom-50-led-spot)" AllocateDmxChannels="13" Weight="5.64" Power="185" DimWidth="225" DimHeight="340" DimDepth="210">
                     <ChannelFocus Name="Pan" DefaultValue="32896" Highlight="65535" Deflection="0" DmxByte0="1" DmxByte1="3" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1">
                         <Range Name="Pan 0…540°" Start="0" End="65535" AutoMenu="1" Centre="0"/>
                     </ChannelFocus>
                     <ChannelFocus Name="Tilt" DefaultValue="32896" Highlight="65535" Deflection="0" DmxByte0="2" DmxByte1="4" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="2">
@@ -45,22 +45,22 @@
                         <Range Name="Intensity off…bright" Start="0" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelIntensity>
                     <ChannelBeam Name="Gobo" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="9" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="7">
                         <Range Name="Open" Start="0" End="7" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 1 Glass" Start="8" End="15" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 2 Glass" Start="16" End="23" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 3 Metal" Start="24" End="31" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 4 Metal" Start="32" End="39" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 5 Metal" Start="40" End="47" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 6 Metal" Start="48" End="55" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 7 Metal" Start="56" End="63" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 7 Metal shake slow…fast" Start="64" End="71" AutoMenu="1" Centre="1"/>
-                        <Range Name="Gobo 6 Metal shake slow…fast" Start="72" End="79" AutoMenu="1" Centre="1"/>
-                        <Range Name="Gobo 5 Metal shake slow…fast" Start="80" End="87" AutoMenu="1" Centre="1"/>
-                        <Range Name="Gobo 4 Metal shake slow…fast" Start="88" End="95" AutoMenu="1" Centre="1"/>
-                        <Range Name="Gobo 3 Metal shake slow…fast" Start="96" End="103" AutoMenu="1" Centre="1"/>
-                        <Range Name="Gobo 2 Glass shake slow…fast" Start="104" End="111" AutoMenu="1" Centre="1"/>
-                        <Range Name="Gobo 1 Glass shake slow…fast" Start="112" End="119" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Red with 10 circles" Start="8" End="15" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Raindrops on window" Start="16" End="23" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Swirl" Start="24" End="31" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Biohazard" Start="32" End="39" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Rose petal" Start="40" End="47" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Triangle/hexagon pattern" Start="48" End="55" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Dot spiral" Start="56" End="63" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Dot spiral shake slow…fast" Start="64" End="71" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Triangle/hexagon pattern shake slow…fast" Start="72" End="79" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Rose petal shake slow…fast" Start="80" End="87" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Biohazard shake slow…fast" Start="88" End="95" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Swirl shake slow…fast" Start="96" End="103" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Raindrops on window shake slow…fast" Start="104" End="111" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Red with 10 circles shake slow…fast" Start="112" End="119" AutoMenu="1" Centre="1"/>
                         <Range Name="Open" Start="120" End="127" AutoMenu="1" Centre="0"/>
                         <Range Name="Gobo Wheel rotation CW slow…fast" Start="128" End="191" AutoMenu="1" Centre="1"/>
                         <Range Name="Gobo Wheel rotation CCW slow…fast" Start="192" End="255" AutoMenu="1" Centre="1"/>
                     </ChannelBeam>
@@ -110,9 +110,9 @@
                         <Range Name="Sound-controlled Program 7" Start="232" End="247" AutoMenu="1" Centre="0"/>
                         <Range Name="Sound-controlled Program 8" Start="248" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelBeam>
                 </Fixture>
-                <Fixture _CreationDate="2017-04-29#00:00:00" _ModifiedDate="2018-09-04#00:00:00" Name="Phantom 50 LED Spot (8ch mode)" NameShort="Phant50-8ch" Comment="Ordercode 40187 (generated by the Open Fixture Library – https://open-fixture-library.org/showtec/phantom-50-led-spot)" AllocateDmxChannels="8" Weight="5.64" Power="185" DimWidth="225" DimHeight="340" DimDepth="210">
+                <Fixture _CreationDate="2017-04-29#00:00:00" _ModifiedDate="2020-02-11#00:00:00" Name="Phantom 50 LED Spot (8ch mode)" NameShort="Phant50-8ch" Comment="Ordercode 40187 (generated by the Open Fixture Library – https://open-fixture-library.org/showtec/phantom-50-led-spot)" AllocateDmxChannels="8" Weight="5.64" Power="185" DimWidth="225" DimHeight="340" DimDepth="210">
                     <ChannelFocus Name="Pan" DefaultValue="128" Highlight="255" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1">
                         <Range Name="Pan 0…540°" Start="0" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelFocus>
                     <ChannelFocus Name="Tilt" DefaultValue="128" Highlight="255" Deflection="0" DmxByte0="2" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="2">
@@ -150,22 +150,22 @@
                         <Range Name="Intensity off…bright" Start="0" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelIntensity>
                     <ChannelBeam Name="Gobo" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="6" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="6">
                         <Range Name="Open" Start="0" End="7" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 1 Glass" Start="8" End="15" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 2 Glass" Start="16" End="23" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 3 Metal" Start="24" End="31" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 4 Metal" Start="32" End="39" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 5 Metal" Start="40" End="47" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 6 Metal" Start="48" End="55" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 7 Metal" Start="56" End="63" AutoMenu="1" Centre="0"/>
-                        <Range Name="Gobo 7 Metal shake slow…fast" Start="64" End="71" AutoMenu="1" Centre="1"/>
-                        <Range Name="Gobo 6 Metal shake slow…fast" Start="72" End="79" AutoMenu="1" Centre="1"/>
-                        <Range Name="Gobo 5 Metal shake slow…fast" Start="80" End="87" AutoMenu="1" Centre="1"/>
-                        <Range Name="Gobo 4 Metal shake slow…fast" Start="88" End="95" AutoMenu="1" Centre="1"/>
-                        <Range Name="Gobo 3 Metal shake slow…fast" Start="96" End="103" AutoMenu="1" Centre="1"/>
-                        <Range Name="Gobo 2 Glass shake slow…fast" Start="104" End="111" AutoMenu="1" Centre="1"/>
-                        <Range Name="Gobo 1 Glass shake slow…fast" Start="112" End="119" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Red with 10 circles" Start="8" End="15" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Raindrops on window" Start="16" End="23" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Swirl" Start="24" End="31" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Biohazard" Start="32" End="39" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Rose petal" Start="40" End="47" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Triangle/hexagon pattern" Start="48" End="55" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Dot spiral" Start="56" End="63" AutoMenu="1" Centre="0"/>
+                        <Range Name="Gobo Dot spiral shake slow…fast" Start="64" End="71" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Triangle/hexagon pattern shake slow…fast" Start="72" End="79" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Rose petal shake slow…fast" Start="80" End="87" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Biohazard shake slow…fast" Start="88" End="95" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Swirl shake slow…fast" Start="96" End="103" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Raindrops on window shake slow…fast" Start="104" End="111" AutoMenu="1" Centre="1"/>
+                        <Range Name="Gobo Red with 10 circles shake slow…fast" Start="112" End="119" AutoMenu="1" Centre="1"/>
                         <Range Name="Open" Start="120" End="127" AutoMenu="1" Centre="0"/>
                         <Range Name="Gobo Wheel rotation CW slow…fast" Start="128" End="191" AutoMenu="1" Centre="1"/>
                         <Range Name="Gobo Wheel rotation CCW slow…fast" Start="192" End="255" AutoMenu="1" Centre="1"/>
                     </ChannelBeam>
🆚 showtec/phantom-50-led-spot: millumin
Changed outputted file showtec/phantom-50-led-spot.json 
--- removed
+++ added
@@ -5,9 +5,9 @@
   "categories": ["Moving Head", "Color Changer"],
   "meta": {
     "authors": ["Felix Edelmann", "Flo Edelmann"],
     "createDate": "2017-04-29",
-    "lastModifyDate": "2018-09-04"
+    "lastModifyDate": "2020-02-11"
   },
   "comment": "Ordercode 40187",
   "manualURL": "https://www.highlite.com/media/attachments/MANUAL/40187_MANUAL_GB_V1.pdf",
   "physical": {
@@ -205,67 +205,67 @@
           "color": "#ffffff"
         },
         {
           "range": [8, 15],
-          "name": "Gobo 1 Glass"
+          "name": "Gobo Red with 10 circles"
         },
         {
           "range": [16, 23],
-          "name": "Gobo 2 Glass"
+          "name": "Gobo Raindrops on window"
         },
         {
           "range": [24, 31],
-          "name": "Gobo 3 Metal"
+          "name": "Gobo Swirl"
         },
         {
           "range": [32, 39],
-          "name": "Gobo 4 Metal"
+          "name": "Gobo Biohazard"
         },
         {
           "range": [40, 47],
-          "name": "Gobo 5 Metal"
+          "name": "Gobo Rose petal"
         },
         {
           "range": [48, 55],
-          "name": "Gobo 6 Metal"
+          "name": "Gobo Triangle/hexagon pattern"
         },
         {
           "range": [56, 63],
-          "name": "Gobo 7 Metal"
+          "name": "Gobo Dot spiral"
         },
         {
           "range": [64, 71],
-          "name": "Gobo 7 Metal shake slow…fast",
+          "name": "Gobo Dot spiral shake slow…fast",
           "menuClick": "center"
         },
         {
           "range": [72, 79],
-          "name": "Gobo 6 Metal shake slow…fast",
+          "name": "Gobo Triangle/hexagon pattern shake slow…fast",
           "menuClick": "center"
         },
         {
           "range": [80, 87],
-          "name": "Gobo 5 Metal shake slow…fast",
+          "name": "Gobo Rose petal shake slow…fast",
           "menuClick": "center"
         },
         {
           "range": [88, 95],
-          "name": "Gobo 4 Metal shake slow…fast",
+          "name": "Gobo Biohazard shake slow…fast",
           "menuClick": "center"
         },
         {
           "range": [96, 103],
-          "name": "Gobo 3 Metal shake slow…fast",
+          "name": "Gobo Swirl shake slow…fast",
           "menuClick": "center"
         },
         {
           "range": [104, 111],
-          "name": "Gobo 2 Glass shake slow…fast",
+          "name": "Gobo Raindrops on window shake slow…fast",
           "menuClick": "center"
         },
         {
           "range": [112, 119],
-          "name": "Gobo 1 Glass shake slow…fast",
+          "name": "Gobo Red with 10 circles shake slow…fast",
           "menuClick": "center"
         },
         {
           "range": [120, 127],
💤 showtec/phantom-50-led-spot: op-z Outputted files not changed.
🆚 showtec/phantom-50-led-spot: qlcplus_4.12.1
Changed outputted file fixtures/Showtec-Phantom-50-LED-Spot.qxf 
--- removed
+++ added
@@ -47,22 +47,22 @@
  <Channel Name="Intensity" Preset="IntensityDimmer"/>
  <Channel Name="Gobo">
   <Group Byte="0">Gobo</Group>
   <Capability Min="0" Max="7" Preset="GoboMacro" Res1="Others/open.svg">Open</Capability>
-  <Capability Min="8" Max="15" Preset="GoboMacro">Gobo 1 Glass</Capability>
-  <Capability Min="16" Max="23" Preset="GoboMacro">Gobo 2 Glass</Capability>
-  <Capability Min="24" Max="31" Preset="GoboMacro">Gobo 3 Metal</Capability>
-  <Capability Min="32" Max="39" Preset="GoboMacro">Gobo 4 Metal</Capability>
-  <Capability Min="40" Max="47" Preset="GoboMacro">Gobo 5 Metal</Capability>
-  <Capability Min="48" Max="55" Preset="GoboMacro">Gobo 6 Metal</Capability>
-  <Capability Min="56" Max="63" Preset="GoboMacro">Gobo 7 Metal</Capability>
-  <Capability Min="64" Max="71" Preset="GoboShakeMacro">Gobo 7 Metal shake slow…fast</Capability>
-  <Capability Min="72" Max="79" Preset="GoboShakeMacro">Gobo 6 Metal shake slow…fast</Capability>
-  <Capability Min="80" Max="87" Preset="GoboShakeMacro">Gobo 5 Metal shake slow…fast</Capability>
-  <Capability Min="88" Max="95" Preset="GoboShakeMacro">Gobo 4 Metal shake slow…fast</Capability>
-  <Capability Min="96" Max="103" Preset="GoboShakeMacro">Gobo 3 Metal shake slow…fast</Capability>
-  <Capability Min="104" Max="111" Preset="GoboShakeMacro">Gobo 2 Glass shake slow…fast</Capability>
-  <Capability Min="112" Max="119" Preset="GoboShakeMacro">Gobo 1 Glass shake slow…fast</Capability>
+  <Capability Min="8" Max="15" Preset="GoboMacro" Res1="Others/gobo00001.svg">Gobo Red with 10 circles</Capability>
+  <Capability Min="16" Max="23" Preset="GoboMacro" Res1="Others/gobo00113.png">Gobo Raindrops on window</Capability>
+  <Capability Min="24" Max="31" Preset="GoboMacro" Res1="Others/gobo00038.svg">Gobo Swirl</Capability>
+  <Capability Min="32" Max="39" Preset="GoboMacro" Res1="Others/gobo00039.svg">Gobo Biohazard</Capability>
+  <Capability Min="40" Max="47" Preset="GoboMacro" Res1="Chauvet/gobo00017.svg">Gobo Rose petal</Capability>
+  <Capability Min="48" Max="55" Preset="GoboMacro" Res1="Others/gobo00040.svg">Gobo Triangle/hexagon pattern</Capability>
+  <Capability Min="56" Max="63" Preset="GoboMacro" Res1="Others/gobo00041.svg">Gobo Dot spiral</Capability>
+  <Capability Min="64" Max="71" Preset="GoboShakeMacro" Res1="Others/gobo00041.svg">Gobo Dot spiral shake slow…fast</Capability>
+  <Capability Min="72" Max="79" Preset="GoboShakeMacro" Res1="Others/gobo00040.svg">Gobo Triangle/hexagon pattern shake slow…fast</Capability>
+  <Capability Min="80" Max="87" Preset="GoboShakeMacro" Res1="Chauvet/gobo00017.svg">Gobo Rose petal shake slow…fast</Capability>
+  <Capability Min="88" Max="95" Preset="GoboShakeMacro" Res1="Others/gobo00039.svg">Gobo Biohazard shake slow…fast</Capability>
+  <Capability Min="96" Max="103" Preset="GoboShakeMacro" Res1="Others/gobo00038.svg">Gobo Swirl shake slow…fast</Capability>
+  <Capability Min="104" Max="111" Preset="GoboShakeMacro" Res1="Others/gobo00113.png">Gobo Raindrops on window shake slow…fast</Capability>
+  <Capability Min="112" Max="119" Preset="GoboShakeMacro" Res1="Others/gobo00001.svg">Gobo Red with 10 circles shake slow…fast</Capability>
   <Capability Min="120" Max="127" Preset="GoboMacro" Res1="Others/open.svg">Open</Capability>
   <Capability Min="128" Max="191" Preset="RotationClockwiseSlowToFast">Gobo Wheel rotation CW slow…fast</Capability>
   <Capability Min="192" Max="255" Preset="RotationCounterClockwiseSlowToFast">Gobo Wheel rotation CCW slow…fast</Capability>
  </Channel>
💤 stairville/mh-x30: colorsource Outputted files not changed.
💤 stairville/mh-x30: d-light Outputted files not changed.
💤 stairville/mh-x30: ecue Outputted files not changed.
💤 stairville/mh-x30: millumin Outputted files not changed.
💤 stairville/mh-x30: op-z Outputted files not changed.
💤 stairville/mh-x30: qlcplus_4.12.1 Outputted files not changed.

@FloEdelmann FloEdelmann merged commit 6e759d2 into master Feb 11, 2020
@FloEdelmann FloEdelmann deleted the gobo-resources branch February 11, 2020 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fxedel fxedel fxedel approved these changes

Assignees
No one assigned
Labels
component-fixture Affects one or more existing fixture definitions. component-model Affects the fixture model ES classes. component-plugin Affects one or more import or export plugins. component-schema Affects the fixture JSON schema. component-test Affects the automated tests. component-ui Affects the user interface on the open-fixture-library.org website.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Gobo resources
2 participants
@FloEdelmann @fxedel