Skip to content

Commit

Permalink
Merge pull request #25 from open-stage/release_v1.0.0
Browse files Browse the repository at this point in the history
v1.0.0 "Vanilla"
  • Loading branch information
hugoaboud authored Mar 4, 2023
2 parents 83df413 + 8fbfed8 commit 9a65e7c
Show file tree
Hide file tree
Showing 18 changed files with 82 additions and 24 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ panels/__pycache__
assets/profiles/*
assets/models/*/*
!assets/profiles/BlenderDMX*

*.zip
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ A DMX visualization tool inside `Blender`, designed to offer a free, easy and fu
First of all, make sure you have installed [Blender 3.0](https://www.blender.org/download/) or higher;
Then, download the `zip` file:

- **LATEST RELEASE (STABLE): v0.5.0 Beta**
- **LATEST RELEASE (STABLE): v1.0.0 Vanilla**

1. Download the [latest release](https://github.com/hugoaboud/BlenderDMX/releases/tag/v0.5.0-beta) `dmx.zip` file
1. Download the [latest release](https://github.com/open-stage/BlenderDMX/releases/tag/v1.0.0) `dmx.zip` file

- **ROLLING RELEASE (UNSTABLE)**

1. Download the [repository ZIP](https://github.com/hugoaboud/BlenderDMX/archive/main.zip) `BlenderDMX-main.zip` file
1. Download the [repository ZIP](https://github.com/open-stage/BlenderDMX/archive/main.zip) `BlenderDMX-main.zip` file
2. Unzip it
3. Rename the folder `BlenderDMX-main` inside it to `dmx`
4. Zip it back, so you have: `dmx.zip/dmx/<contents>`
Expand All @@ -35,7 +35,7 @@ To enable the addon, go to `Edit > Preferences > Add-ons`, search for "DMX" and

## How to Use

For details on how to use the Addon, check our [Wiki](https://github.com/hugoaboud/BlenderDMX/wiki).
For details on how to use the Addon, check our [Wiki](https://github.com/open-stage/BlenderDMX/wiki).

Check the demonstration video:
[demonstration video](https://www.youtube.com/watch?v=uzZQhcqSjS4)
Expand Down
11 changes: 5 additions & 6 deletions __init__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
bl_info = {
"name": "DMX",
"description": "DMX Visualization, with GDTF and ArtNet support.",
"author": "hugoaboud",
"version": (0, 5, 0),
"blender": (2, 90, 0),
"author": "open-stage",
"version": (1, 0, 0),
"blender": (3, 0, 0),
"location": "3D View > DMX",
"warning": "", # used for warning icon and text in addons panel
"wiki_url": "http://www.github.com/hugoaboud/blenderDMX/wiki",
"wiki_url": "http://www.github.com/open-stage/blenderDMX/wiki",
"tracker_url": "",
"category": "Lighting"
}
Expand Down Expand Up @@ -109,7 +109,7 @@ class DMX(PropertyGroup):
DMX_OT_Programmer_Clear,
DMX_OT_Programmer_SelectBodies,
DMX_OT_Programmer_SelectTargets,
DMX_OT_Programmer_SelectCamera,
#DMX_OT_Programmer_SelectCamera,
DMX_PT_Programmer )

linkedToFile = False
Expand Down Expand Up @@ -741,7 +741,6 @@ def updatePreviewVolume(self):
def addUniverse(self):
id = len(self.universes)
DMX_Universe.add(self, id, "DMX %d"%id)
print("DMX", "DMX_Universe created: ", universe)

def removeUniverse(self, i):
DMX_Universe.remove(self, i)
Expand Down
2 changes: 1 addition & 1 deletion data.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# - Set from artnet
# -
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import bpy
Expand Down
2 changes: 1 addition & 1 deletion fixture.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BlendexDMX > Fixture
# Base class for a lighting fixture
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import bpy
Expand Down
2 changes: 1 addition & 1 deletion gdtf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BlendexDMX > GDTF
# Handles GDTF profiles
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import os
Expand Down
2 changes: 1 addition & 1 deletion group.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BlendexDMX > Group
# A group of fixtures
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import bpy
Expand Down
2 changes: 1 addition & 1 deletion material.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BlendexDMX > Material
# Methods to create special materials (such as the default light emitter)
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import bpy
Expand Down
2 changes: 1 addition & 1 deletion model.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BlendexDMX > Model
# Handles the creation of different models
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import os.path
Expand Down
2 changes: 1 addition & 1 deletion panels/dmx.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# - Setup DMX Universes
# - Setup ArtNet (Future)
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import bpy
Expand Down
2 changes: 1 addition & 1 deletion panels/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# - Add/Edit/Remove Fixtures
# - Select Fixtures by name for programming
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import bpy
Expand Down
2 changes: 1 addition & 1 deletion panels/groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# - Create/Update/Rename/Remove Groups
# - Select Fixtures by group for programming
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import bpy
Expand Down
2 changes: 1 addition & 1 deletion panels/programmer.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# - Set selected fixtures intensity
# - Clear selection
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import bpy
Expand Down
2 changes: 1 addition & 1 deletion panels/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# - Create/Update a Box that fits the whole scene with a Volume Scatter
# shader, and control it's visibility and density (for simulating haze)
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import bpy
Expand Down
2 changes: 1 addition & 1 deletion param.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BlendexDMX > Param
# A DMX parameter (Dimmer, Color, etc)
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import bpy
Expand Down
57 changes: 57 additions & 0 deletions scripts/build_release.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import re
import os
import shutil
from distutils.dir_util import copy_tree
from pygit2 import Repository

BUILD_DIR = 'build'

branch_name = Repository('.').head.shorthand
if (branch_name == None):
raise Exception('Run the script from the project root.')

branch_name = 'master'

release_name = branch_name
if (re.match(r'^release_v\d+\.\d+\.\d+$', branch_name)):
print('Warning: This is not a release branch. The branch should be named "release_vX.Y.Z".')
release_name = branch_name[8:]

zip_name = 'blenderDMX_' + release_name

print('---------')
print('branch name: ' + branch_name)
print('release name: ' + release_name)
print('zip name: ' + zip_name + '.zip')
print('---------')

print('Resetting build directory...')
if (os.path.exists(BUILD_DIR)):
shutil.rmtree(BUILD_DIR)
os.mkdir(BUILD_DIR)
os.mkdir(BUILD_DIR+'/dmx')

print('Copying dependencies to build directory...')
copy_tree('assets', BUILD_DIR+'/dmx/assets')
copy_tree('io_scene_3ds', BUILD_DIR+'/dmx/io_scene_3ds')
copy_tree('panels', BUILD_DIR+'/dmx/panels')
copy_tree('pygdtf', BUILD_DIR+'/dmx/pygdtf')
copy_tree('pymvr', BUILD_DIR+'/dmx/pymvr')
copy_tree('sacn', BUILD_DIR+'/dmx/sacn')

print('Copying source to build directory...')
for filename in os.listdir('.'):
if filename.endswith('.py'):
shutil.copy2(filename, BUILD_DIR+'/dmx')

print('Copying metadata to build directory...')
shutil.copy2('CHANGELOG.md', BUILD_DIR+'/dmx')
shutil.copy2('LICENSE', BUILD_DIR+'/dmx')

print('Zipping release...')
shutil.make_archive(zip_name, 'zip', BUILD_DIR)

print('Clearing build directory...')
shutil.rmtree(BUILD_DIR)

print('Build successfull! Have a great release!')
2 changes: 1 addition & 1 deletion universe.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BlendexDMX > Universe
# A DMX Universe, which contains a number ID, a name and an input source
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import bpy
Expand Down
2 changes: 1 addition & 1 deletion util.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BlendexDMX > Utilities
# General utility functions
#
# http://www.github.com/hugoaboud/BlenderDMX
# http://www.github.com/open-stage/BlenderDMX
#

import bpy
Expand Down

0 comments on commit 9a65e7c

Please sign in to comment.