Skip to content

Commit

Permalink
Move ModelLoader from minecraft to graphics
Browse files Browse the repository at this point in the history
  • Loading branch information
object-Object committed May 12, 2024
1 parent fd84f04 commit 1c0a94a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 2 additions & 0 deletions src/hexdoc/graphics/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
__all__ = [
"DebugType",
"ModelLoader",
"ModelRenderer",
"ModelTexture",
]

from .loader import ModelLoader
from .renderer import ModelRenderer
from .texture import ModelTexture
from .utils import DebugType
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
from yarl import URL

from hexdoc.core import ModResourceLoader, ResourceLocation
from hexdoc.graphics import ModelRenderer, ModelTexture
from hexdoc.minecraft.model import BlockModel
from hexdoc.utils import ValidationContext

from .model import BlockModel
from .renderer import ModelRenderer
from .texture import ModelTexture

logger = logging.getLogger(__name__)

Expand Down
3 changes: 1 addition & 2 deletions src/hexdoc/minecraft/model/blockstate.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
from pydantic import AfterValidator, BeforeValidator, ConfigDict, model_validator

from hexdoc.core import ResourceLocation
from hexdoc.model import HexdocModel
from hexdoc.model.base import DEFAULT_CONFIG
from hexdoc.model import DEFAULT_CONFIG, HexdocModel


class Blockstate(HexdocModel):
Expand Down
3 changes: 1 addition & 2 deletions src/hexdoc/minecraft/model/element.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@

from pydantic import AfterValidator, Field

from hexdoc.model import HexdocModel
from hexdoc.model.base import IGNORE_EXTRA_CONFIG
from hexdoc.model import IGNORE_EXTRA_CONFIG, HexdocModel
from hexdoc.utils.types import Vec3, Vec4, clamped


Expand Down

0 comments on commit 1c0a94a

Please sign in to comment.