Skip to content

Commit

Permalink
Some Structure changes, _Sidebar.md
Browse files Browse the repository at this point in the history
  • Loading branch information
Aspirata committed Jul 15, 2024
1 parent c9ef784 commit 05360bf
Show file tree
Hide file tree
Showing 8 changed files with 630 additions and 629 deletions.
610 changes: 0 additions & 610 deletions Mcblend Source/Materials/Materials.py

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Mcblend Source/Operators.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ class ApplyResourcePack(Operator):

def execute(self, context):
start_time = time.time()
Materials.apply_resources()
apply_resources()
end_time = time.time()
elapsed_time = end_time - start_time
debugger(f"apply_resources() took {elapsed_time:.4f} seconds to complete.")
Expand Down
16 changes: 2 additions & 14 deletions Mcblend Source/Properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,6 @@ class ResourcePackProperties(PropertyGroup):
default=True,
)

def pack_options_update(self, context):
bpy.ops.resource_pack.options('INVOKE_DEFAULT')

pack_options: EnumProperty(
name="Pack_Options",
items=[
('Remove', "Remove Pack", ""),
('Info', "Pack Info", ""),
],
update=pack_options_update
)

resource_packs_settings: BoolProperty(
name="Advanced Settings",
default=False,
Expand Down Expand Up @@ -336,7 +324,7 @@ class PPBRProperties(PropertyGroup):
)

animate_textures: BoolProperty(
name="Animate textures",
name="Procedurally Animate textures",
default=False,
description=""
)
Expand All @@ -348,7 +336,7 @@ class PPBRProperties(PropertyGroup):
)

change_bsdf_settings: BoolProperty(
name="Change BSDF Settings",
name="Change BSDF Settings Settings LoL",
default=False,
description=""
)
Expand Down
614 changes: 613 additions & 1 deletion Mcblend Source/Resource_Packs.py

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion Mcblend Source/Utils/Absolute_Solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
},
}

# Calls AS
# P.S Variables after "tech_things" made for calling AS with an error that isn't in the Absolute_Solver_Errors
# An example of this special error - Assets.py | 35 line

def Absolute_Solver(error_code="None", data=None, tech_things="None", error_name="None", description=None, mode=None):
Preferences = bpy.context.preferences.addons[__package__.split(".")[0]].preferences
try:
Expand All @@ -82,7 +86,7 @@ def GetASText(error_code, text):
except:
bpy.ops.special.absolute_solver('INVOKE_DEFAULT', Error_Code = "000", Error_Name = GetASText("000", "Error Name"), Description = GetASText("000", 'Description'), Tech_Things = str(traceback.format_exc()))

class AbsoluteSolver(bpy.types.Operator):
class AbsoluteSolverPanel(bpy.types.Operator):
bl_label = "Absolute Solver"
bl_idname = "special.absolute_solver"
bl_options = {'REGISTER', 'UNDO'}
Expand Down
4 changes: 2 additions & 2 deletions Mcblend Source/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from .Preferences import McblendPreferences
from .MCB_API import *
from .Assets import update_assets
from .Utils.Absolute_Solver import AbsoluteSolver
from .Utils.Absolute_Solver import AbsoluteSolverPanel
from .Resource_Packs import update_default_pack
from .UI import *
from .Operators import *
Expand Down Expand Up @@ -35,7 +35,7 @@ def InitOnStart():
def load_post_handler(dummy):
InitOnStart()

classes = [McblendPreferences, AbsoluteSolver, RecreateEnvironment, # Special Paneles
classes = [McblendPreferences, AbsoluteSolverPanel, RecreateEnvironment, # Special Paneles
WorldProperties, MaterialsProperties, ResourcePackProperties, CreateEnvProperties, PPBRProperties, OptimizationProperties, UtilsProperties, AssetsProperties, # Properties
WorldAndMaterialsPanel, OptimizationPanel, UtilsPanel, AssetPanel, Assets_List_UL_, # Panels
RemoveAttributeOperator, OpenConsoleOperator, FixWorldOperator, SwapTexturesOperator, ResourcePackToggleOperator, MoveResourcePackUp, MoveResourcePackDown, # Operators
Expand Down
Binary file modified Mcblend.blend
Binary file not shown.
7 changes: 7 additions & 0 deletions _Sidebar.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## Pages

- [Home](Home)
- [About](About)
- [World & Materials](World-Materials)
- [Assets (UAS)](Assets-UAS)
- [For developers](For-developers)

0 comments on commit 05360bf

Please sign in to comment.