Browse Source

Clean up

pull/1/head
Anne Marije v/d Meer 12 years ago
parent
commit
916ae79833
  1. 2
      korman/__init__.py
  2. 5
      korman/exporter.py
  3. 3
      korman/operators/op_export.py
  4. 2
      korman/operators/op_world.py
  5. 1
      korman/properties/__init__.py
  6. 1
      korman/properties/prop_object.py
  7. 2
      korman/properties/prop_world.py
  8. 4
      korman/render.py
  9. 1
      korman/ui/ui_object.py
  10. 1
      korman/ui/ui_world.py

2
korman/__init__.py

@ -28,6 +28,7 @@ bl_info = {
# Blender panels (think materials) # Blender panels (think materials)
} }
def register(): def register():
"""Registers all Blender operators and GUI items in Korman""" """Registers all Blender operators and GUI items in Korman"""
@ -38,6 +39,7 @@ def register():
operators.register() operators.register()
properties.register() properties.register()
def unregister(): def unregister():
"""Unregisters all Blender operators and GUI items""" """Unregisters all Blender operators and GUI items"""
bpy.utils.unregister_module(__name__) bpy.utils.unregister_module(__name__)

5
korman/exporter.py

@ -17,6 +17,7 @@ import bpy
import os.path import os.path
from PyHSPlasma import * from PyHSPlasma import *
class ExportError(Exception): class ExportError(Exception):
def __init__(self, value="Undefined Export Error"): def __init__(self, value="Undefined Export Error"):
super(Exception, self).__init__(value) super(Exception, self).__init__(value)
@ -47,7 +48,6 @@ class Exporter:
f = node.addPoolObject f = node.addPoolObject
f(pl.key) f(pl.key)
@property @property
def age_name(self): def age_name(self):
return os.path.splitext(os.path.split(self._op.filepath)[1])[0] return os.path.splitext(os.path.split(self._op.filepath)[1])[0]
@ -152,7 +152,8 @@ class Exporter:
def _generate_builtins(self): def _generate_builtins(self):
# Find the highest two available negative suffixes for BuiltIn and Textures # Find the highest two available negative suffixes for BuiltIn and Textures
# This should generally always resolve to -2 and -1 # This should generally always resolve to -2 and -1
suffixes = []; _s = -1 suffixes = []
_s = -1
while len(suffixes) != 2: while len(suffixes) != 2:
for location in self._pages.values(): for location in self._pages.values():
if location.page == _s: if location.page == _s:

3
korman/operators/op_export.py

@ -17,6 +17,7 @@ import bpy
import os, os.path import os, os.path
from .. import exporter from .. import exporter
class ExportOperator(bpy.types.Operator): class ExportOperator(bpy.types.Operator):
"""Exports ages for Cyan Worlds' Plasma Engine""" """Exports ages for Cyan Worlds' Plasma Engine"""
@ -91,5 +92,7 @@ def menu_cb(self, context):
if context.scene.render.engine == "PLASMA_GAME": if context.scene.render.engine == "PLASMA_GAME":
self.layout.operator_context = "INVOKE_DEFAULT" self.layout.operator_context = "INVOKE_DEFAULT"
self.layout.operator(ExportOperator.bl_idname, text="Plasma Age (.age)") self.layout.operator(ExportOperator.bl_idname, text="Plasma Age (.age)")
def register(): def register():
bpy.types.INFO_MT_file_export.append(menu_cb) bpy.types.INFO_MT_file_export.append(menu_cb)

2
korman/operators/op_world.py

@ -15,11 +15,13 @@
import bpy import bpy
class AgeOperator: class AgeOperator:
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
return context.scene.render.engine == "PLASMA_GAME" return context.scene.render.engine == "PLASMA_GAME"
class PageAddOperator(AgeOperator, bpy.types.Operator): class PageAddOperator(AgeOperator, bpy.types.Operator):
bl_idname = "world.plasma_page_add" bl_idname = "world.plasma_page_add"
bl_label = "Add Page" bl_label = "Add Page"

1
korman/properties/__init__.py

@ -18,6 +18,7 @@ import bpy
from .prop_object import * from .prop_object import *
from .prop_world import * from .prop_world import *
def register(): def register():
bpy.types.Object.plasma_object = PointerProperty(type=PlasmaObject) bpy.types.Object.plasma_object = PointerProperty(type=PlasmaObject)
bpy.types.World.plasma_age = PointerProperty(type=PlasmaAge) bpy.types.World.plasma_age = PointerProperty(type=PlasmaAge)

1
korman/properties/prop_object.py

@ -16,6 +16,7 @@
import bpy import bpy
from bpy.props import * from bpy.props import *
class PlasmaObject(bpy.types.PropertyGroup): class PlasmaObject(bpy.types.PropertyGroup):
def _enabled(self, context): def _enabled(self, context):
# This makes me sad # This makes me sad

2
korman/properties/prop_world.py

@ -17,6 +17,7 @@ import bpy
from bpy.props import * from bpy.props import *
from PyHSPlasma import * from PyHSPlasma import *
class PlasmaFni(bpy.types.PropertyGroup): class PlasmaFni(bpy.types.PropertyGroup):
bl_idname = "world.plasma_fni" bl_idname = "world.plasma_fni"
@ -49,6 +50,7 @@ class PlasmaFni(bpy.types.PropertyGroup):
soft_min=100, soft_min=100,
min=1) min=1)
class PlasmaPage(bpy.types.PropertyGroup): class PlasmaPage(bpy.types.PropertyGroup):
def _check_suffix(self, context): def _check_suffix(self, context):
"""Verifies that a suffix change does not conflict""" """Verifies that a suffix change does not conflict"""

4
korman/render.py

@ -15,6 +15,7 @@
import bpy import bpy
class PlasmaRenderEngine(bpy.types.RenderEngine): class PlasmaRenderEngine(bpy.types.RenderEngine):
bl_idname = "PLASMA_GAME" bl_idname = "PLASMA_GAME"
@ -28,6 +29,7 @@ properties_material.MATERIAL_PT_context_material.COMPAT_ENGINES.add("PLASMA_GAME
properties_material.MATERIAL_PT_preview.COMPAT_ENGINES.add("PLASMA_GAME") properties_material.MATERIAL_PT_preview.COMPAT_ENGINES.add("PLASMA_GAME")
del properties_material del properties_material
@classmethod @classmethod
def _new_poll(cls, context): def _new_poll(cls, context):
"""Nifty replacement for naughty built-in Blender poll()s""" """Nifty replacement for naughty built-in Blender poll()s"""
@ -36,6 +38,8 @@ def _new_poll(cls, context):
else: else:
# Dear god you better save the old poll... # Dear god you better save the old poll...
return cls._old_poll(cls, context) return cls._old_poll(cls, context)
def _swap_poll(cls): def _swap_poll(cls):
cls._old_poll = cls.poll cls._old_poll = cls.poll
cls.poll = _new_poll cls.poll = _new_poll

1
korman/ui/ui_object.py

@ -15,6 +15,7 @@
import bpy import bpy
class ObjectButtonsPanel: class ObjectButtonsPanel:
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW" bl_region_type = "WINDOW"

1
korman/ui/ui_world.py

@ -15,6 +15,7 @@
import bpy import bpy
class AgeButtonsPanel: class AgeButtonsPanel:
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW" bl_region_type = "WINDOW"

Loading…
Cancel
Save