|
@@ -23,13 +23,6 @@ class Model extends Object3D {
|
|
lockAnimation = obj.lockAnimation;
|
|
lockAnimation = obj.lockAnimation;
|
|
}
|
|
}
|
|
|
|
|
|
- function setCullingCollider( o : h3d.scene.Object, cc : h3d.col.Collider ) {
|
|
|
|
- return; // TODO: Fix bounds update after object move
|
|
|
|
- o.cullingCollider = cc;
|
|
|
|
- for( c in @:privateAccess o.children )
|
|
|
|
- setCullingCollider(c, cc);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
override function makeInstance(ctx:Context):Context {
|
|
override function makeInstance(ctx:Context):Context {
|
|
if( source == null)
|
|
if( source == null)
|
|
return super.makeInstance(ctx);
|
|
return super.makeInstance(ctx);
|
|
@@ -42,11 +35,16 @@ class Model extends Object3D {
|
|
root.addChild(obj);
|
|
root.addChild(obj);
|
|
obj = root;
|
|
obj = root;
|
|
}
|
|
}
|
|
|
|
+ #if editor
|
|
|
|
+ for(m in obj.findAll(o -> Std.instance(o, h3d.scene.Mesh)))
|
|
|
|
+ m.cullingCollider = new h3d.col.ObjectCollider(m, m.primitive.getBounds().toSphere());
|
|
|
|
+ #end
|
|
obj.name = name;
|
|
obj.name = name;
|
|
ctx.local3d.addChild(obj);
|
|
ctx.local3d.addChild(obj);
|
|
ctx.local3d = obj;
|
|
ctx.local3d = obj;
|
|
updateInstance(ctx);
|
|
updateInstance(ctx);
|
|
|
|
|
|
|
|
+
|
|
if( animation != null )
|
|
if( animation != null )
|
|
obj.playAnimation(ctx.loadAnimation(animation));
|
|
obj.playAnimation(ctx.loadAnimation(animation));
|
|
|
|
|
|
@@ -61,16 +59,6 @@ class Model extends Object3D {
|
|
return ctx;
|
|
return ctx;
|
|
}
|
|
}
|
|
|
|
|
|
- var tmpBounds = new h3d.col.Bounds();
|
|
|
|
- override function updateInstance( ctx: Context, ?propName : String ) {
|
|
|
|
- super.updateInstance(ctx, propName);
|
|
|
|
- var o = ctx.local3d;
|
|
|
|
- #if editor
|
|
|
|
- var cc = o.getBounds(tmpBounds).toSphere();
|
|
|
|
- setCullingCollider(o, cc);
|
|
|
|
- #end
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
#if editor
|
|
#if editor
|
|
override function edit( ctx : EditContext ) {
|
|
override function edit( ctx : EditContext ) {
|
|
super.edit(ctx);
|
|
super.edit(ctx);
|