diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index b87c2f8..1b5c6d6 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -113,3 +113,56 @@ DefaultFrameRate=(Numerator=24,Denominator=1) [/Script/NDIIO.NDIIOPluginSettings] bBeginBroadcastOnPlay=True +[/Script/DMXProtocol.DMXProtocolSettings] ++OutputPortConfigs=(PortName="OutputPort1",ProtocolName="Art-Net",CommunicationType=Broadcast,bAutoCompleteDeviceAddressEnabled=False,AutoCompleteDeviceAddress="192.*",DeviceAddress="10.3.3.31",DestinationAddress="None",DestinationAddresses=((DestinationAddressString="10.3.3.255")),bLoopbackToEngine=False,LocalUniverseStart=1,NumUniverses=1,ExternUniverseStart=1,bIsExternUnivereStartEditable=False,Priority=100,Delay=0.000000,DelayFrameRate=(Numerator=25,Denominator=1),PortGuid=113BD0304F0500A965A6E5A0ECC5D52F) +SendingRefreshRate=44 ++FixtureCategories=Other ++FixtureCategories=Strobe ++FixtureCategories=Moving Mirror ++FixtureCategories=Moving Head ++FixtureCategories=Matrix/Pixel Bar ++FixtureCategories=Static ++Attributes=(Name="NumBeams",Keywords="") ++Attributes=(Name="Angle",Keywords="") ++Attributes=(Name="Temperature",Keywords="") ++Attributes=(Name="Launch",Keywords="") ++Attributes=(Name="Burst",Keywords="") ++Attributes=(Name="ModeStartStop",Keywords="") ++Attributes=(Name="Prism",Keywords="") ++Attributes=(Name="CIE_Y",Keywords="") ++Attributes=(Name="CIE_X",Keywords="") ++Attributes=(Name="FanMode",Keywords="") ++Attributes=(Name="HSB_Brightness",Keywords="") ++Attributes=(Name="HSB_Saturation",Keywords="") ++Attributes=(Name="HSB_Hue",Keywords="") ++Attributes=(Name="Color XF",Keywords="") ++Attributes=(Name="Tint",Keywords="") ++Attributes=(Name="CTC",Keywords="") ++Attributes=(Name="Reset",Keywords="FixtureReset, FixtureGlobalReset, GlobalReset") ++Attributes=(Name="Frost",Keywords="") ++Attributes=(Name="Effects",Keywords="Effect, Macro, Effects") ++Attributes=(Name="Shaper Rotation",Keywords="ShaperRot") ++Attributes=(Name="Color Rotation",Keywords="ColorWheelSpin") ++Attributes=(Name="Gobo Wheel Rotate",Keywords="GoboWheelSpin, GoboWheelRotate") ++Attributes=(Name="Gobo Spin",Keywords="GoboSpin") ++Attributes=(Name="Gobo",Keywords="GoboWheel, Gobo1") ++Attributes=(Name="Iris",Keywords="") ++Attributes=(Name="Focus",Keywords="") ++Attributes=(Name="Zoom",Keywords="") ++Attributes=(Name="Tilt",Keywords="") ++Attributes=(Name="Shutter",Keywords="Strobe") ++Attributes=(Name="Pan",Keywords="") ++Attributes=(Name="Dimmer",Keywords="Intensity, Strength, Brightness") ++Attributes=(Name="Amber",Keywords="ColorAdd_A") ++Attributes=(Name="White",Keywords="ColorAdd_W") ++Attributes=(Name="Yellow",Keywords="ColorAdd_Y, ColorSub_Y") ++Attributes=(Name="Magenta",Keywords="ColorAdd_M, ColorSub_M") ++Attributes=(Name="Cyan",Keywords="ColorAdd_C, ColorSub_C") ++Attributes=(Name="Blue",Keywords="ColorAdd_B") ++Attributes=(Name="Green",Keywords="ColorAdd_G") ++Attributes=(Name="Red",Keywords="ColorAdd_R") ++Attributes=(Name="Color",Keywords="ColorWheel, Color1") +bDefaultSendDMXEnabled=True +bDefaultReceiveDMXEnabled=False +bAllFixturePatchesReceiveDMXInEditor=True + diff --git a/Content/Levels/Lidinis/Blueprints/DEV_Remote.uasset b/Content/Levels/Lidinis/Blueprints/DEV_Remote.uasset index e8cc833..6989933 100644 Binary files a/Content/Levels/Lidinis/Blueprints/DEV_Remote.uasset and b/Content/Levels/Lidinis/Blueprints/DEV_Remote.uasset differ diff --git a/Content/Levels/Lidinis360/Lidinis360.umap b/Content/Levels/Lidinis360/Lidinis360.umap index e2d819b..8052aba 100644 Binary files a/Content/Levels/Lidinis360/Lidinis360.umap and b/Content/Levels/Lidinis360/Lidinis360.umap differ diff --git a/Content/Levels/Lidinis360/Lidinis360MultiInstance.umap b/Content/Levels/Lidinis360/Lidinis360MultiInstance.umap index 20b3f97..1e59b02 100644 Binary files a/Content/Levels/Lidinis360/Lidinis360MultiInstance.umap and b/Content/Levels/Lidinis360/Lidinis360MultiInstance.umap differ diff --git a/Content/NewDMXControlConsole.uasset b/Content/NewDMXControlConsole.uasset new file mode 100644 index 0000000..1d51eda Binary files /dev/null and b/Content/NewDMXControlConsole.uasset differ diff --git a/Content/TheStudio/DMX/LS_DMX.uasset b/Content/TheStudio/DMX/LS_DMX.uasset new file mode 100644 index 0000000..1c3c691 Binary files /dev/null and b/Content/TheStudio/DMX/LS_DMX.uasset differ diff --git a/Content/TheStudio/DMX/NewDMXPixelMapping.uasset b/Content/TheStudio/DMX/NewDMXPixelMapping.uasset new file mode 100644 index 0000000..008fe8c Binary files /dev/null and b/Content/TheStudio/DMX/NewDMXPixelMapping.uasset differ diff --git a/Content/TheStudio/DMX/Remote_DMX.uasset b/Content/TheStudio/DMX/Remote_DMX.uasset new file mode 100644 index 0000000..6fca324 Binary files /dev/null and b/Content/TheStudio/DMX/Remote_DMX.uasset differ diff --git a/Content/TheStudio/DMX/RenderTargetForDMX.uasset b/Content/TheStudio/DMX/RenderTargetForDMX.uasset new file mode 100644 index 0000000..80d5b1f Binary files /dev/null and b/Content/TheStudio/DMX/RenderTargetForDMX.uasset differ diff --git a/Content/TheStudio/DMX/StudioDMXLibrary.uasset b/Content/TheStudio/DMX/StudioDMXLibrary.uasset new file mode 100644 index 0000000..661a4a4 Binary files /dev/null and b/Content/TheStudio/DMX/StudioDMXLibrary.uasset differ diff --git a/DEV_TheStudio.uproject b/DEV_TheStudio.uproject index 1204a79..84b2abf 100644 --- a/DEV_TheStudio.uproject +++ b/DEV_TheStudio.uproject @@ -441,6 +441,22 @@ { "Name": "VPxDecoderElectra", "Enabled": true + }, + { + "Name": "DMXFixtures", + "Enabled": true + }, + { + "Name": "DMXDisplayCluster", + "Enabled": true + }, + { + "Name": "DMXControlConsole", + "Enabled": true + }, + { + "Name": "RemoteControlProtocolDMX", + "Enabled": true } ] } \ No newline at end of file