Skip to content

Commit e343f33

Browse files
authored
Drop physical.focus (#885)
* Add Barrel Scanner category * Update schema * Add icon * Downgrade in plugins if needed * Use in fixtures * Remove physical.focus property * Remove in schema, model, UI, docs and fixtures * Regenerate properties in plugins where needed * Simplify category suggestions * Remove Moving Head category from tilting bars * Bump schema version to 12.0.0
1 parent 48bab26 commit e343f33

File tree

194 files changed

+597
-1535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+597
-1535
lines changed

docs/fixture-format.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The `physical` section describes properties not directly used in the DMX protoco
6767

6868
A fixture can have multiple *modes* (also sometimes called *personalities*) like "Basic 3-channel mode" or "Extended 5-channel mode". Our modes are not allowed to have the word "mode" in them, as it is automatically appended at the end.
6969

70-
A mode can contain the `physical` property to override specific physical data of the fixture. E.g. one mode could set the `panMax` value different than the fixture default.
70+
A mode can contain the `physical` property to override specific physical data of the fixture. E.g. one mode could set the `power` value different than the fixture default.
7171

7272
A mode's `shortName` must be unique amongst all modes of the respective fixture.
7373

docs/model-api.md

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2046,10 +2046,6 @@ A fixture's technical data, belonging to the hardware and not the DMX protocol.
20462046
* [.lensName](#Physical+lensName) ⇒ <code>string</code> \| <code>null</code>
20472047
* [.lensDegreesMin](#Physical+lensDegreesMin) ⇒ <code>number</code> \| <code>null</code>
20482048
* [.lensDegreesMax](#Physical+lensDegreesMax) ⇒ <code>number</code> \| <code>null</code>
2049-
* [.hasFocus](#Physical+hasFocus) ⇒ <code>boolean</code> \| <code>null</code>
2050-
* [.focusType](#Physical+focusType) ⇒ <code>&#x27;Fixed&#x27;</code> \| <code>&#x27;Head&#x27;</code> \| <code>&#x27;Mirror&#x27;</code> \| <code>&#x27;Barrel&#x27;</code> \| <code>null</code>
2051-
* [.focusPanMax](#Physical+focusPanMax) ⇒ <code>number</code> \| <code>null</code>
2052-
* [.focusTiltMax](#Physical+focusTiltMax) ⇒ <code>number</code> \| <code>null</code>
20532049
* [.hasMatrixPixels](#Physical+hasMatrixPixels) ⇒ <code>boolean</code>
20542050
* [.matrixPixelsDimensions](#Physical+matrixPixelsDimensions) ⇒ <code>array.&lt;number&gt;</code> \| <code>null</code>
20552051
* [.matrixPixelsSpacing](#Physical+matrixPixelsSpacing) ⇒ <code>array.&lt;number&gt;</code> \| <code>null</code>
@@ -2144,26 +2140,6 @@ Creates a new Physical instance.
21442140
### physical.lensDegreesMax ⇒ <code>number</code> \| <code>null</code>
21452141
**Kind**: instance property of [<code>Physical</code>](#Physical)
21462142
**Returns**: <code>number</code> \| <code>null</code> - The maximum possible beam angle in degrees. Defaults to null.
2147-
<a name="Physical+hasFocus"></a>
2148-
2149-
### physical.hasFocus ⇒ <code>boolean</code> \| <code>null</code>
2150-
**Kind**: instance property of [<code>Physical</code>](#Physical)
2151-
**Returns**: <code>boolean</code> \| <code>null</code> - Whether physical data about the focus is available.
2152-
<a name="Physical+focusType"></a>
2153-
2154-
### physical.focusType ⇒ <code>&#x27;Fixed&#x27;</code> \| <code>&#x27;Head&#x27;</code> \| <code>&#x27;Mirror&#x27;</code> \| <code>&#x27;Barrel&#x27;</code> \| <code>null</code>
2155-
**Kind**: instance property of [<code>Physical</code>](#Physical)
2156-
**Returns**: <code>&#x27;Fixed&#x27;</code> \| <code>&#x27;Head&#x27;</code> \| <code>&#x27;Mirror&#x27;</code> \| <code>&#x27;Barrel&#x27;</code> \| <code>null</code> - Whether and how this fixture can change its focus point. Defaults to null.
2157-
<a name="Physical+focusPanMax"></a>
2158-
2159-
### physical.focusPanMax ⇒ <code>number</code> \| <code>null</code>
2160-
**Kind**: instance property of [<code>Physical</code>](#Physical)
2161-
**Returns**: <code>number</code> \| <code>null</code> - The maximum angle in degrees that this fixture can rotate in horizontal direction (Pan). `Number.POSITIVE_INFINITY` if continuous pan is possible. Defaults to null.
2162-
<a name="Physical+focusTiltMax"></a>
2163-
2164-
### physical.focusTiltMax ⇒ <code>number</code> \| <code>null</code>
2165-
**Kind**: instance property of [<code>Physical</code>](#Physical)
2166-
**Returns**: <code>number</code> \| <code>null</code> - The maximum angle in degrees that this fixture can rotate in vertical direction (Tilt). `Number.POSITIVE_INFINITY` if continuous pan is possible. Defaults to null.
21672143
<a name="Physical+hasMatrixPixels"></a>
21682144

21692145
### physical.hasMatrixPixels ⇒ <code>boolean</code>

fixtures/5star-systems/spica-250m.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@
2929
},
3030
"lens": {
3131
"degreesMinMax": [18, 18]
32-
},
33-
"focus": {
34-
"type": "Head",
35-
"panMax": 530,
36-
"tiltMax": 280
3732
}
3833
},
3934
"wheels": {

fixtures/abstract/twister-4.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
"DMXconnector": "3-pin",
2727
"bulb": {
2828
"type": "A1/259"
29-
},
30-
"focus": {
31-
"type": "Fixed"
3229
}
3330
},
3431
"wheels": {

fixtures/adb/alc4.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
"bulb": {
2020
"type": "LED",
2121
"lumens": 4000
22-
},
23-
"focus": {
24-
"type": "Fixed"
2522
}
2623
},
2724
"matrix": {

fixtures/adb/warp-m.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
"bulb": {
2121
"type": "halogen",
2222
"colorTemperature": 3200
23-
},
24-
"focus": {
25-
"type": "Head",
26-
"panMax": 400,
27-
"tiltMax": 275
2823
}
2924
},
3025
"availableChannels": {

fixtures/afx/lmh460z.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
},
3636
"lens": {
3737
"degreesMinMax": [15, 60]
38-
},
39-
"focus": {
40-
"type": "Head",
41-
"panMax": 540,
42-
"tiltMax": 280
4338
}
4439
},
4540
"availableChannels": {

fixtures/american-dj/auto-spot-150.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@
2121
},
2222
"lens": {
2323
"degreesMinMax": [13, 13]
24-
},
25-
"focus": {
26-
"type": "Head",
27-
"panMax": 540,
28-
"tiltMax": 270
2924
}
3025
},
3126
"wheels": {

fixtures/american-dj/crazy-pocket-8.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030
},
3131
"lens": {
3232
"degreesMinMax": [4, 4]
33-
},
34-
"focus": {
35-
"type": "Head",
36-
"panMax": 540,
37-
"tiltMax": 205
3833
}
3934
},
4035
"matrix": {

fixtures/american-dj/dotz-par.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
},
2323
"lens": {
2424
"degreesMinMax": [25, 60]
25-
},
26-
"focus": {
27-
"type": "Fixed"
2825
}
2926
},
3027
"availableChannels": {

0 commit comments

Comments
 (0)