Skip to content

Commit

Permalink
Release v0.2.0 (#638)
Browse files Browse the repository at this point in the history
  • Loading branch information
carson-katri authored Apr 21, 2023
1 parent 66a1485 commit b79a677
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 12 deletions.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,37 @@ If you want a visual guide to installation, see this video tutorial from Ashlee

Here's a few quick guides:

## [Setting Up](docs/SETUP.md)
## [Setting Up](https://github.com/carson-katri/dream-textures/wiki/Setup)
Setup instructions for various platforms and configurations.

## [Image Generation](docs/IMAGE_GENERATION.md)
## [Image Generation](https://github.com/carson-katri/dream-textures/wiki/Image-Generation)
Create textures, concept art, and more with text prompts. Learn how to use the various configuration options to get exactly what you're looking for.

![A graphic showing each step of the image generation process](docs/assets/image_generation.png)

## [Texture Projection](docs/TEXTURE_PROJECTION.md)
## [Texture Projection](https://github.com/carson-katri/dream-textures/wiki/Texture-Projection)
Texture entire models and scenes with depth to image.

![A graphic showing each step of the texture projection process](docs/assets/texture_projection.png)

## [Inpaint/Outpaint](docs/INPAINT_OUTPAINT.md)
## [Inpaint/Outpaint](https://github.com/carson-katri/dream-textures/wiki/Inpaint-and-Outpaint)
Inpaint to fix up images and convert existing textures into seamless ones automatically.

Outpaint to increase the size of an image by extending it in any direction.

![A graphic showing each step of the outpainting process](docs/assets/inpaint_outpaint.png)

## [Render Pass](docs/RENDER_PASS.md)
Perform style transfer and create novel animations with Stable Diffusion as a post processing step.
## [Render Engine](https://github.com/carson-katri/dream-textures/wiki/Render-Engine)
Use the Dream Textures node system to create complex effects.

![A graphic showing each frame of a render pass, split with the original and generated result](docs/assets/render_pass.png)
![A graphic showing each frame of a render, split with the scene and generated result](docs/assets/render_pass.png)

## [AI Upscaling](docs/AI_UPSCALING.md)
## [AI Upscaling](https://github.com/carson-katri/dream-textures/wiki/AI-Upscaling)
Upscale your low-res generations 4x.

![A graphic showing each step of the upscaling process](docs/assets/upscale.png)

## [History](docs/HISTORY.md)
## [History](https://github.com/carson-katri/dream-textures/wiki/History)
Recall, export, and import history entries for later use.

# Compatibility
Expand All @@ -65,7 +65,7 @@ If you have an issue with a supported GPU, please create an issue.
If your hardware is unsupported, you can use DreamStudio to process in the cloud. Follow the instructions in the release notes to setup with DreamStudio.

# Contributing
For detailed instructions on installing from source, see the guide on [setting up a development environment](./docs/DEVELOPMENT_ENVIRONMENT.md).
For detailed instructions on installing from source, see the guide on [setting up a development environment](https://github.com/carson-katri/dream-textures/wiki/Setting-Up-a-Development-Environment).

# Troubleshooting

Expand Down
2 changes: 1 addition & 1 deletion __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"author": "Dream Textures contributors",
"description": "Use Stable Diffusion to generate unique textures straight from the shader editor.",
"blender": (3, 1, 0),
"version": (0, 1, 0),
"version": (0, 2, 0),
"location": "Image Editor -> Sidebar -> Dream",
"category": "Paint"
}
Expand Down
13 changes: 13 additions & 0 deletions engine/nodes/pipeline_nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ def execute(self, context, prompt, negative_prompt, width, height, steps, seed,
args = self.prompt.generate_args()

shared_args = context.depsgraph.scene.dream_textures_engine_prompt.generate_args()

# the source image is a default color, ignore it.
if np.array(source_image).shape == (4,):
source_image = None

if controlnets is not None:
if not isinstance(controlnets, list):
Expand Down Expand Up @@ -212,6 +216,7 @@ def execute(self, context, prompt, negative_prompt, width, height, steps, seed,
)
event = threading.Event()
result = None
exception = None
def on_response(_, response):
context.update(response.images[0])
if context.test_break():
Expand All @@ -225,9 +230,17 @@ def on_done(future):
result = future.result()
event.set()

def on_exception(_, error):
nonlocal exception
exception = error
event.set()

future.add_response_callback(on_response)
future.add_done_callback(on_done)
future.add_exception_callback(on_exception)
event.wait()
if exception is not None:
raise exception
return {
'Image': result[-1].images[-1]
}
Expand Down
2 changes: 1 addition & 1 deletion version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = (0, 1, 0)
VERSION = (0, 2, 0)
def version_tag(version):
return f"{version[0]}.{version[1]}.{version[2]}"

Expand Down

0 comments on commit b79a677

Please sign in to comment.