Skip to content

Commit

Permalink
Merge pull request #1 from vircadia/feature/v1_0
Browse files Browse the repository at this point in the history
v1.0
  • Loading branch information
digisomni authored Oct 1, 2024
2 parents 785a271 + aa51c99 commit ea863da
Show file tree
Hide file tree
Showing 79 changed files with 6,275 additions and 3,410 deletions.
23 changes: 23 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Video
*.mp4 filter=lfs diff=lfs merge=lfs -text
*.mov filter=lfs diff=lfs merge=lfs -text
*.avi filter=lfs diff=lfs merge=lfs -text
*.wmv filter=lfs diff=lfs merge=lfs -text
*.flv filter=lfs diff=lfs merge=lfs -text
*.mkv filter=lfs diff=lfs merge=lfs -text
*.webm filter=lfs diff=lfs merge=lfs -text

# Audio
*.wav filter=lfs diff=lfs merge=lfs -text
*.mp3 filter=lfs diff=lfs merge=lfs -text
*.ogg filter=lfs diff=lfs merge=lfs -text
*.flac filter=lfs diff=lfs merge=lfs -text
*.aac filter=lfs diff=lfs merge=lfs -text
*.m4a filter=lfs diff=lfs merge=lfs -text

# 3D and Animation
*.blend filter=lfs diff=lfs merge=lfs -text
*.fbx filter=lfs diff=lfs merge=lfs -text
*.obj filter=lfs diff=lfs merge=lfs -text
*.glb filter=lfs diff=lfs merge=lfs -text
*.gltf filter=lfs diff=lfs merge=lfs -text
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
test/export/*
test/import/*

development-env/

# Python
__pycache__
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "vircadia-world-meta"]
path = vircadia-world-meta
url = https://github.com/vircadia/vircadia-world-meta
[submodule "vircadia-world-sdk-blender"]
path = vircadia-world-sdk-blender
url = https://github.com/vircadia/vircadia-world-sdk-blender.git
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"python.analysis.autoImportCompletions": true,
"python.analysis.typeCheckingMode": "basic"
}
402 changes: 201 additions & 201 deletions LICENSE

Large diffs are not rendered by default.

25 changes: 23 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
# Vircadia World Tools
# Vircadia World Blender Tools

This is a Blender add-on that allows the creation of full Vircadia worlds within Blender, to be exported directly for upload into the server once done.

## Installation

1. Download the latest release from the [releases page](https://github.com/vircadia/vircadia-world-tools/releases).
2. Open Blender and go to `Edit > Preferences > Add-ons`.
3. Click `Install` and select the downloaded folder.
4. Enable the add-on.
5. Make sure your right sidebar is open, if not the hotkey typically is `N` to open it.
6. Navigate to the `Vircadia` tab.

## Requirements

Blender Version [TBD]
Blender Version 4.2 (LTS) or later.

## Development

1. Make a 'development-env' venv with python 3.10 or later.
2. Install the dependencies with pip.
3. Run Blender from the command line with the development add-on enabled.

```bash
python3 -m venv development-env
source development-env/bin/activate
pip install -r requirements.txt
```
28 changes: 13 additions & 15 deletions .../vircadia_blender_world_tools/__init__.py → __init__.py
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
bl_info = {
"name": "Vircadia Blender Importer/Exporter",
"author": "Ben Brennan",
"version": (0, 1),
"blender": (4, 2, 0),
"location": "View3D > Sidebar > Vircadia",
"description": "Import and export Vircadia environments to/from Blender",
"category": "Import-Export",
}

import bpy
from . import import_export
from . import ui
from . import utils
from . import operators
from . import lightmap

bl_info = {
"name": "Vircadia World Tools",
"author": "Vircadia Contributors",
"version": (0, 1, 0),
"blender": (4, 2, 0),
"location": "View3D > Sidebar > Vircadia",
"description": "Create and edit Vircadia worlds in Blender",
"category": "Import-Export",
}

def register():
import_export.register()
ui.register()
utils.register()
operators.register()

# Register the transform update handler
bpy.app.handlers.depsgraph_update_post.append(utils.object_creation.transform_update_handler)
lightmap.register()

def unregister():
# Unregister the transform update handler
bpy.app.handlers.depsgraph_update_post.remove(utils.object_creation.transform_update_handler)

lightmap.unregister()
operators.unregister()
utils.unregister()
ui.unregister()
Expand Down
3 changes: 3 additions & 0 deletions _category_.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"label": "Blender"
}
File renamed without changes.
File renamed without changes
16 changes: 0 additions & 16 deletions blender/vircadia_blender_world_tools/import_export/__init__.py

This file was deleted.

This file was deleted.

175 changes: 0 additions & 175 deletions blender/vircadia_blender_world_tools/import_export/json_exporter.py

This file was deleted.

Loading

0 comments on commit ea863da

Please sign in to comment.