Updates / Fixes for Blender 2.8 and 2.9

.github/workflows/molecular-build.yml

@@ -0,0 +1,135 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Molecular Addon for Blender
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build_windows:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.11"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest cython==3.0.0
+       # if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Build with Cython
+      id: build
+      # run: echo "::set-output name=version::$(python make_release.py)"
+      # force bash shell on windows too
+      shell: bash 
+      run: echo "version=$(python make_release.py)" >> $GITHUB_OUTPUT
+    - name: Upload windows zip
+      uses: actions/upload-artifact@v4
+      with:
+        path: molecular_${{ steps.build.outputs.version }}_win.zip
+        name: molecular_win
+
+  build_linux:
+
+    runs-on: ubuntu-22.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.11"
+    - name: Install dependencies
+      run: |
+        # attempt to install libpython.a for 3.11
+        sudo add-apt-repository ppa:deadsnakes/ppa
+        sudo apt update
+        sudo apt install libpython3.11-dev
+        python -m pip install --upgrade pip
+        pip install flake8 pytest cython==3.0.0
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Build with Cython
+      id: build
+      #run: echo "::set-output name=version::$(python make_release.py)"
+      run: echo "version=$(python make_release.py)" >> $GITHUB_OUTPUT
+    - name: Upload linux zip
+      uses: actions/upload-artifact@v4
+      with:
+        path: molecular_${{ steps.build.outputs.version }}_linux.zip
+        name: molecular_linux
+
+  build_macos:
+
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.11"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest cython==3.0.0
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Build with Cython
+      id: build
+      #run: echo "::set-output name=version::$(python make_release.py)"
+      run: echo "version=$(python make_release.py)" >> $GITHUB_OUTPUT
+    - name: Upload mac zip
+      uses: actions/upload-artifact@v4
+      with:
+        path: molecular_${{ steps.build.outputs.version }}_mac.zip
+        name: molecular_mac
+
+  upload_draft:
+
+    name: Upload zips as draft release assets
+    runs-on: ubuntu-latest
+    needs: [build_windows, build_linux, build_macos]
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: actions/download-artifact@v4
+      with:
+        name: molecular_win
+
+    - uses: actions/download-artifact@v4
+      with:
+        name: molecular_linux
+
+    - uses: actions/download-artifact@v4
+      with:
+        name: molecular_mac
+
+    - name: Uploading
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_REPOSITORY: $GITHUB_REPOSITORY
+      run: python .github/workflows/release.py --path . --files `ls *.zip`

.github/workflows/release.py

@@ -0,0 +1,49 @@
+import requests, argparse, json, os
+
+parser = argparse.ArgumentParser(description='Parameters.')
+parser.add_argument('--path', metavar='path', type=str, nargs='+',
+                    help='path where to search for files')
+parser.add_argument('--files', metavar='files', type=str, nargs='+',
+                    help='name of files to upload')       
+args = parser.parse_args()
+d = vars(args)
+
+r = os.environ['GITHUB_REPOSITORY']
+t = os.environ['GITHUB_TOKEN']
+p = d['path'][0]
+fi = d['files']
+
+owner = r.split("/")[0]
+name = r.split("/")[1]
+
+j = {"tag_name":"v1.0.0", # can be manually edited on publishing this draft !
+     "target_commitish":"master",
+     "name": name,
+     "body":"Autogenerated release package",
+     "draft":True,
+     "prerelease":False,
+     "generate_release_notes":False},
+
+js = json.dumps(j[0])
+
+r = requests.post(
+    headers={'Accept': 'application/vnd.github.v3+json',
+             'Authorization': 'token {token}'.format(token=t)},
+    url='https://api.github.com/repos/{owner}/{name}/releases'.format(owner=owner, name=name),
+    data=js,
+)
+
+if "upload_url" in r.json():
+    u = r.json()["upload_url"].split("{")[0]
+
+for f in fi:
+    pr = os.path.realpath(p)
+    pa = os.path.join(pr, f)
+    with open(pa, 'rb') as data:
+        r = requests.post(
+            headers={'Content-Type': 'application/zip',
+                     'Authorization': 'token {token}'.format(token=t)},
+            url=u+'?name={name}'.format(name=f),
+            data=data.read()
+        )
+

.gitignore

@@ -0,0 +1,7 @@
+__pycache__
+*.pyd
+build
+*.c
+*.html
+.vscode
+*.zip

README.md

@@ -1,11 +1,11 @@
+![Molecular Addon for Blender](https://github.com/scorpion81/Blender-Molecular-Script/workflows/Molecular%20Addon%20for%20Blender/badge.svg)
+
 Blender-Molecular-Script
 ========================
 
-This is my molecular python script for blender.Inspired from the 2d simulator Really (1998) and Lagoa Multiphysic in Softimage.
-
-To download the latest version go on my blog:
+This is the molecular python script for blender, originally coded py Pyroevil. Inspired from the 2d simulator Really (1998) and Lagoa Multiphysic in Softimage.
 
-http://pyroevil.com/molecular-script-download/
+To download the latest version go to the release section of this repository.
 
 The script can be installed like any other addons in Blender:
 First way:
@@ -25,7 +25,53 @@ To activate the plugins:
 - In the "Object" categories, you must find "Molecular"
 - Check it , close the "Blender user preferences" windows and have fun.
 
+How to manually build Molecular:
+--------------------------------
+
+In order for a manual recompilation clone this repo and just run
+
+`python make_release.py` 
+
+from within the "Blender-Molecular-Script" folder on your desired platform,
+
+with a python version matching blender's own being installed. 
+(and cython, too. install with pip for example)
+
+
+Or alternatively, run
+
+`python setup.py build_ext --inplace` 
+
+from the "sources" folder.
+
+
+How to add UVs to molecular particle instances:
+----------------------------------------------
+
+This didnt seem to work in blender 3.2.x any more and was fixed in 1.1.4.
+Should also apply to blender 3.1.x but that was not tested by me.
+
+- Original Link:
+https://blenderartists.org/t/moleculars-physics/521682/269
+
+- Example File:
+[test_UV_molecular.zip](https://github.com/scorpion81/Blender-Molecular-Script/files/9320719/test_UV_molecular.zip)
+
+When the UV data is being baked during the simulation, it will be written into the angular velocity cache part 
+of the particle system at the moment.
+
+Hence you can retrieve it via a particle info node later on in order to feed it into the vector socket of the
+texture node. Note that the Particle Info Node belongs to the Material on the Sphere aka the object which is being instanced.
+In the example blend file there is also a Particle Info Node on the Cube material, but it doesnt really belong there. Rather
+it was added by mistake.
+
+Example with 10x10x10 Grid:
+![molecular_bake_uv](https://user-images.githubusercontent.com/1172149/184380338-b07cb5de-4d54-45e0-9fa8-2967f4fb29cc.jpeg)
 
-Visit my blog about this script for donation, comments or more detail : http://pyroevil.com
+Same Example with 30x30x30 Grid
+![molecular_bake_uv_high](https://user-images.githubusercontent.com/1172149/184380364-9e4a1ff9-8924-4619-9d77-f191950c52e7.jpeg)
 
-You can find older version in the release folder.
+Remarks:
+- only in cycles
+- only in rendered viewport and render
+- need to re-bake the sim for UVs after loading (not persistent, it seems)

make_release.py

@@ -0,0 +1,74 @@
+from molecular import bl_info
+from zipfile import ZipFile, ZIP_DEFLATED
+from os import path, walk, remove, chdir, getcwd
+import shutil
+import platform
+import sys
+import pathlib
+from subprocess import Popen, PIPE
+
+is_linux = platform.architecture()[1] == "ELF" or platform.system() == "Linux"
+is_windows = platform.architecture()[1] == "WindowsPE" or platform.system() == "Windows"
+
+#in python 3.8.x, sys.abiflags attribute doesnt seem to exist any more instead of returning empty string.
+#so better check for existence here before accessing it.
+abiflags = ''
+if hasattr(sys, 'abiflags'):
+    abiflags = sys.abiflags
+
+v = str(sys.version_info.major) + str(sys.version_info.minor) + abiflags
+
+name = 'mac'
+if is_linux:
+    name = 'linux'
+elif is_windows:
+    name = 'win'
+
+chdir(getcwd()+"//sources")
+
+#TODO, blenders (or a compatible) python bin needs to be in $PATH, and if you use blender's you need to copy the python includes from SVN
+#into the include folder of blenders python, too
+
+version = '.'.join(map(str, bl_info['version']))
+
+with Popen([sys.executable, "setup.py", "build_ext", "--inplace"], stdout=PIPE) as proc:
+    proc.stdout.read()
+    if is_linux: #TODO, test
+        shutil.move("core.cpython-{}-x86_64-linux-gnu.so".format(v), "..//molecular//core.cpython-{}-x86_64-linux-gnu.so".format(v))
+    elif is_windows: 
+        shutil.move("core.cp{}-win_amd64.pyd".format(v), "..//molecular//core.cp{}-win_amd64.pyd".format(v))
+    else:
+        shutil.move("core.cpython-{}-darwin.so".format(v), "..//molecular//core.cpython-{}-darwin.so".format(v))
+
+    chdir("..")
+
+    with ZipFile('molecular_{}_'.format(('.'.join(map(str, bl_info['version'])))) + name +'.zip', 'w') as z:
+        for root, _, files in walk('molecular'):
+            for file in files:
+                if not file.endswith('.py') and not file.endswith('.so') and not file.endswith('.pyd'):
+                    continue
+                z.write(path.join(root, file), compress_type=ZIP_DEFLATED)
+    #cleanup
+    chdir(getcwd()+"//molecular")
+    try:
+        if is_linux:
+            remove("core.cpython-{}-x86_64-linux-gnu.so".format(v))
+        elif is_windows:
+            remove("core.cp{}-win_amd64.pyd".format(v))
+        else:
+            remove("core.cpython-{}-darwin.so".format(v))
+    except:
+        pass
+    chdir("..")
+    chdir(getcwd()+"//sources")
+
+    try:
+        remove("core.html")
+        remove("core.c")
+        shutil.rmtree("build")
+    except:
+        pass
+
+    chdir("..")
+
+print(version)