Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Memory leak fixes #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Memory leak fixes #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8bc1ca
Removed strong references that weren't being used but could in the wa…
player-03 Jan 5, 2012
126c00b
Made the reference to the source object weak so that the object can b…
player-03 Jan 5, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 188 additions & 4 deletions src/away3d/containers/Scene3D.as
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,191 @@
package away3d.containers{
package away3d.containers
{
import away3d.arcane;
import away3d.core.base.*;
import away3d.core.session.*; import away3d.core.traverse.*; import away3d.lights.*; import flash.utils.*; use namespace arcane; /** * The root container of all 3d objects in a single scene */ public class Scene3D extends ObjectContainer3D { /** @private */ arcane function setId(object:Object3D):void { var i:int = 0; while(_objects.length > i && _objects[i]) i++; _objects[i] = object; object._id = i; } /** @private */ arcane function clearId(id:int):void { delete _objects[id]; } /** @private */ arcane function internalRemoveLight(light:AbstractLight):void { var index:int; if (light is AmbientLight3D) { index = _ambientLights.indexOf(light); if (index == -1) return; _ambientLights.splice(index, 1); } else if (light is DirectionalLight3D) { index = _directionalLights.indexOf(light); if (index == -1) return; _directionalLights.splice(index, 1); } else if (light is PointLight3D) { index = _pointLights.indexOf(light); if (index == -1) return; _pointLights.splice(index, 1); } _numLights--; } /** @private */ arcane function internalAddLight(light:AbstractLight):void { if (light is AmbientLight3D) _ambientLights.push(light as AmbientLight3D); else if (light is DirectionalLight3D) _directionalLights.push(light as DirectionalLight3D); else if (light is PointLight3D) _pointLights.push(light as PointLight3D); _numLights++; } /** @private */ arcane function flagObject(object:Object3D):void {
import away3d.core.session.*;
import away3d.core.traverse.*;
import away3d.lights.*;

import flash.utils.*;

use namespace arcane;

/**
* The root container of all 3d objects in a single scene
*/
public class Scene3D extends ObjectContainer3D
{
/** @private */
arcane function setId(object:Object3D):void
{
var i:int = 0;

while(_objects.length > i && _objects[i])
i++;

_objects[i] = object;

object._id = i;
}
/** @private */
arcane function clearId(id:int):void
{
delete _objects[id];
}
/** @private */
arcane function internalRemoveLight(light:AbstractLight):void
{
var index:int;

if (light is AmbientLight3D) {
index = _ambientLights.indexOf(light);
if (index == -1)
return;
_ambientLights.splice(index, 1);
} else if (light is DirectionalLight3D) {
index = _directionalLights.indexOf(light);
if (index == -1)
return;
_directionalLights.splice(index, 1);
} else if (light is PointLight3D) {
index = _pointLights.indexOf(light);
if (index == -1)
return;
_pointLights.splice(index, 1);
}

_numLights--;
}
/** @private */
arcane function internalAddLight(light:AbstractLight):void
{
if (light is AmbientLight3D)
_ambientLights.push(light as AmbientLight3D);
else if (light is DirectionalLight3D)
_directionalLights.push(light as DirectionalLight3D);
else if (light is PointLight3D)
_pointLights.push(light as PointLight3D);

_numLights++;
}
/** @private */
arcane function flagObject(object:Object3D):void
{
for each (_view in viewDictionary)
_view._updatedObjects[object] = object; } /** @private */ arcane function flagSession(session:AbstractSession):void { for each (_view in viewDictionary) _view._updatedSessions[session] = session; } private var _ambientLights:Vector.<AmbientLight3D> = new Vector.<AmbientLight3D>(); private var _directionalLights:Vector.<DirectionalLight3D> = new Vector.<DirectionalLight3D>(); private var _pointLights:Vector.<PointLight3D> = new Vector.<PointLight3D>(); private var _numLights:uint; private var _objects:Vector.<Object3D> = new Vector.<Object3D>(); private var _view:View3D; public var viewDictionary:Dictionary = new Dictionary(true); /** * Traverser object for all custom <code>tick()</code> methods * * @see away3d.core.base.Object3D#tick() */ public var tickTraverser:TickTraverser = new TickTraverser(); /** * Defines whether scene events are automatically triggered by the view, or manually by <code>updateScene()</code> */ public var autoUpdate:Boolean; /** * Interface for physics (not implemented) */ public var physics:IPhysicsScene; public function get ambientLights():Vector.<AmbientLight3D> {
return _ambientLights; } public function get directionalLights():Vector.<DirectionalLight3D> { return _directionalLights; } public function get pointLights():Vector.<PointLight3D> { return _pointLights; } public function get numLights():uint { return _numLights; } /** * Creates a new <code>Scene3D</code> object * * @param ...initarray An array of 3d objects to be added as children of the scene on instatiation. Can contain an initialisation object */ public function Scene3D(...initarray) { var init:Object; var childarray:Vector.<Object3D> = new Vector.<Object3D>(); for each (var object:Object in initarray) if (object is Object3D) childarray.push(object as Object3D); else init = object; //force ownCanvas and ownLights if (init) init["ownCanvas"] = true; else init = {ownCanvas:true}; super(init); autoUpdate = ini.getBoolean("autoUpdate", true); var ph:Object = ini.getObject("physics"); if (ph is IPhysicsScene) physics = ph as IPhysicsScene; if (ph is Boolean) if (ph == true) physics = null; // new RobPhysicsEngine(); if (ph is Object) physics = null; // new RobPhysicsEngine(ph); // ph - init object for each (var child:Object3D in childarray) addChild(child); } /** * Calling manually will update 3d objects that execute updates on their <code>tick()</code> methods. * Uses the <code>TickTraverser</code> to traverse all tick methods in the scene. * * @see away3d.core.base.Object3D#tick() * @see away3d.core.traverse.TickTraverser */ public function updateTime(time:int = -1):void { //set current time if (time == -1) time = getTimer(); //traverser scene ticks tickTraverser.now = time; traverse(tickTraverser); if (physics != null) physics.updateTime(time); } }}
_view._updatedObjects[object] = true;
}
/** @private */
arcane function flagSession(session:AbstractSession):void
{
for each (_view in viewDictionary)
_view._updatedSessions[session] = true;
}

private var _ambientLights:Vector.<AmbientLight3D> = new Vector.<AmbientLight3D>();
private var _directionalLights:Vector.<DirectionalLight3D> = new Vector.<DirectionalLight3D>();
private var _pointLights:Vector.<PointLight3D> = new Vector.<PointLight3D>();
private var _numLights:uint;
private var _objects:Vector.<Object3D> = new Vector.<Object3D>();
private var _view:View3D;

public var viewDictionary:Dictionary = new Dictionary(true);

/**
* Traverser object for all custom <code>tick()</code> methods
*
* @see away3d.core.base.Object3D#tick()
*/
public var tickTraverser:TickTraverser = new TickTraverser();

/**
* Defines whether scene events are automatically triggered by the view, or manually by <code>updateScene()</code>
*/
public var autoUpdate:Boolean;

/**
* Interface for physics (not implemented)
*/
public var physics:IPhysicsScene;

public function get ambientLights():Vector.<AmbientLight3D>
{
return _ambientLights;
}

public function get directionalLights():Vector.<DirectionalLight3D>
{
return _directionalLights;
}

public function get pointLights():Vector.<PointLight3D>
{
return _pointLights;
}

public function get numLights():uint
{
return _numLights;
}

/**
* Creates a new <code>Scene3D</code> object
*
* @param ...initarray An array of 3d objects to be added as children of the scene on instatiation. Can contain an initialisation object
*/
public function Scene3D(...initarray)
{
var init:Object;
var childarray:Vector.<Object3D> = new Vector.<Object3D>();

for each (var object:Object in initarray)
if (object is Object3D)
childarray.push(object as Object3D);
else
init = object;

//force ownCanvas and ownLights
if (init)
init["ownCanvas"] = true;
else
init = {ownCanvas:true};

super(init);

autoUpdate = ini.getBoolean("autoUpdate", true);

var ph:Object = ini.getObject("physics");
if (ph is IPhysicsScene)
physics = ph as IPhysicsScene;
if (ph is Boolean)
if (ph == true)
physics = null; // new RobPhysicsEngine();
if (ph is Object)
physics = null; // new RobPhysicsEngine(ph); // ph - init object

for each (var child:Object3D in childarray)
addChild(child);
}

/**
* Calling manually will update 3d objects that execute updates on their <code>tick()</code> methods.
* Uses the <code>TickTraverser</code> to traverse all tick methods in the scene.
*
* @see away3d.core.base.Object3D#tick()
* @see away3d.core.traverse.TickTraverser
*/
public function updateTime(time:int = -1):void
{
//set current time
if (time == -1)
time = getTimer();

//traverser scene ticks
tickTraverser.now = time;
traverse(tickTraverser);


if (physics != null)
physics.updateTime(time);
}
}
}
25 changes: 21 additions & 4 deletions src/away3d/core/utils/ViewSourceObject.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package away3d.core.utils
import away3d.core.render.*;
import away3d.core.vos.*;
import away3d.materials.*;
import flash.utils.Dictionary;

import flash.geom.*;

Expand Down Expand Up @@ -55,7 +56,7 @@ package away3d.core.utils
private var _sv1y:Number;
private var _sv2x:Number;
private var _sv2y:Number;

private var _startIndex:uint;
private var _endIndex:uint;
private var _faceVO:FaceVO;
Expand All @@ -71,7 +72,8 @@ package away3d.core.utils
private var _vertexIndex:uint;
private var segmentCommands:Vector.<String> = Vector.<String>(["M", "L"]);
private var faceCommands:Vector.<String> = Vector.<String>(["M", "L", "L"]);

private var _sourceReference:Dictionary = new Dictionary(true);

private function getEndLoopIndex(i:uint):uint
{
var j:uint = i + 1;
Expand Down Expand Up @@ -110,7 +112,7 @@ package away3d.core.utils
return (ax - bx)*(ax - bx) + (ay - by)*(ay - by);
}

public var source:Object3D;
//public var source:Object3D;
public var screenVertices:Vector.<Number>;
public var screenIndices:Vector.<int>;
public var screenUVTs:Vector.<Number>;
Expand All @@ -121,7 +123,22 @@ package away3d.core.utils
this.source = source;
}


public function get source():Object3D {
for (var s:Object in _sourceReference) {
return s as Object3D;
}

return null;
}

public function set source(newSource:Object3D):void {
for (var s:Object in _sourceReference) {
delete _sourceReference[s];
}

_sourceReference[newSource] = true;
}

public function contains(priIndex:uint, renderer:Renderer, x:Number, y:Number):Boolean
{
_startIndex = renderer.primitiveProperties[uint(priIndex*9)];
Expand Down