Skip to content

Commit 35e2697

Browse files
author
P Svilans
committed
Tag management could/should be handled by the EntityManager.hx, but for now in EntityWorld.hx should be enough.
1 parent 2cc9264 commit 35e2697

File tree

5 files changed

+161
-92
lines changed

5 files changed

+161
-92
lines changed

‎haxelib.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "hxE",
3+
"url": "https://github.com/PDeveloper/hxE",
4+
"license": "MIT",
5+
"tags": ["entity","system","cross"],
6+
"description": "A Haxe Entity System based on the Artemis ES: http://gamadu.com/artemis/\n Read up on Entity systems: http://t-machine.org/index.php/2007/09/03/entity-systems-are-the-future-of-mmog-development-part-1/",
7+
"version": "0.0.1",
8+
"releasenote": "Initial Haxelib2 release",
9+
"contributors": ["PSvils"],
10+
"classPath" : "src"
11+
}
12+
}

‎samples/hxESample_1/src/Main.hx

+21-21
Original file line numberDiff line numberDiff line change
@@ -39,67 +39,67 @@ class Main extends Sprite
3939
// Create the systems we'll be using
4040
displaySystem = new DisplaySystem();
4141
targetSystem = new TargetSystem();
42-
retargetSystem = new RetargetSystem( new Rectangle( 0.0, 0.0, 800.0, 600.0));
42+
retargetSystem = new RetargetSystem(new Rectangle( 0.0, 0.0, 800.0, 600.0));
4343

4444
// Add the systems to the EntityWorld
45-
world.addSystem( displaySystem);
46-
world.addSystem( targetSystem);
47-
world.addSystem( retargetSystem);
45+
world.addSystem(displaySystem);
46+
world.addSystem(targetSystem);
47+
world.addSystem(retargetSystem);
4848

4949
// Add the display systems container so we can see something
50-
addChild( displaySystem.getContainer());
50+
addChild(displaySystem.getContainer());
5151

52-
if ( stage == null) addEventListener( Event.ADDED_TO_STAGE, init);
52+
if (stage == null) addEventListener(Event.ADDED_TO_STAGE, init);
5353
else init();
5454
}
5555

56-
private function init( e:Event = null):Void
56+
private function init(e:Event = null):Void
5757
{
58-
if ( e != null) removeEventListener( Event.ADDED_TO_STAGE, init);
58+
if (e != null) removeEventListener(Event.ADDED_TO_STAGE, init);
5959

6060
// Create 100 entities.
61-
for ( i in 0...100)
61+
for (i in 0...100)
6262
{
6363
var e = world.create();
6464

6565
var graphic:Sprite = new Sprite();
6666

6767
var g = graphic.graphics;
68-
g.beginFill( Std.int( Math.random() * 2147483647), 1.0);
68+
g.beginFill( Std.int(Math.random() * 2147483647), 1.0);
6969

7070
var blockWidth:Float = Math.random() * 20.0 + 10.0;
7171
var blockHeight:Float = Math.random() * 20.0 + 10.0;
7272

73-
g.drawRect( blockWidth * -0.5, blockHeight * -0.5, blockWidth, blockHeight);
73+
g.drawRect(blockWidth * -0.5, blockHeight * -0.5, blockWidth, blockHeight);
7474

75-
var display = new DisplayComponent( graphic);
76-
var transform = new TransformComponent( Math.random() * stage.stageWidth,
75+
var display = new DisplayComponent(graphic);
76+
var transform = new TransformComponent(Math.random() * stage.stageWidth,
7777
Math.random() * stage.stageHeight,
7878
Math.random() * 360.0
7979
);
80-
var target = new TargetComponent( Math.random() * stage.stageWidth,
80+
var target = new TargetComponent(Math.random() * stage.stageWidth,
8181
Math.random() * stage.stageHeight
8282
);
8383

8484
// Add the components
85-
e.addComponent( display);
86-
e.addComponent( transform);
87-
e.addComponent( target);
85+
e.addComponent(display);
86+
e.addComponent(transform);
87+
e.addComponent(target);
8888

8989
// MUST update the entity after adding or removing components!!!
9090
e.update();
9191
}
9292

9393
timeStep = Timer.stamp();
94-
addEventListener( Event.ENTER_FRAME, enterFrame);
94+
addEventListener(Event.ENTER_FRAME, enterFrame);
9595
}
9696

97-
private function enterFrame( e:Event):Void
97+
private function enterFrame(e:Event):Void
9898
{
9999
timeStep = Timer.stamp() - timeStep;
100100

101101
// Update the systems. You can give whichever timestep you want (seconds or milliseconds), since it's up to you to use the timestep in your own systems.
102-
world.updateSystems( timeStep);
102+
world.updateSystems(timeStep);
103103

104104
timeStep = Timer.stamp();
105105
}
@@ -111,7 +111,7 @@ class Main extends Sprite
111111
stage.align = StageAlign.TOP_LEFT;
112112
// entry point
113113

114-
Lib.current.addChild( new Main());
114+
Lib.current.addChild(new Main());
115115
}
116116

117117
}

‎src/hxE/Entity.hx

+28-23
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Entity
2121
* @param id A unique id for this Entity.
2222
*/
2323

24-
public function new( id:Int, world:EntityWorld)
24+
public function new(id:Int, world:EntityWorld)
2525
{
2626
this.id = id;
2727
this.world = world;
@@ -52,17 +52,17 @@ class Entity
5252
* Call this everytime you change this entity's components!
5353
*/
5454

55-
public function update():Void
55+
public inline function update():Void
5656
{
57-
world.updateEntity( this);
57+
world.updateEntity(this);
5858
}
5959

6060
/**
6161
* Add a component if it doesn't exist already.
6262
* @param component The component to add.
6363
*/
6464

65-
public function addComponent( component:Component):Void
65+
public inline function addComponent(component:Component):Void
6666
{
6767
world.componentManager.addComponent( this, component);
6868
}
@@ -73,7 +73,7 @@ class Entity
7373
* @return true if it has this component class
7474
*/
7575

76-
public function hasComponent( componentClass:Class<Component>):Bool
76+
public inline function hasComponent(componentClass:Class<Component>):Bool
7777
{
7878
return world.componentManager.hasComponentClass( this, componentClass);
7979
}
@@ -84,7 +84,7 @@ class Entity
8484
* @return true if it has this component type
8585
*/
8686

87-
public function hasComponentType( type:IComponentType):Bool
87+
public inline function hasComponentType(type:IComponentType):Bool
8888
{
8989
return world.componentManager.hasComponentType( this, type);
9090
}
@@ -94,9 +94,9 @@ class Entity
9494
* @return
9595
*/
9696

97-
public function getComponentIterator():List<Component>
97+
public inline function getComponentIterator():List<Component>
9898
{
99-
return world.componentManager.getComponents( this );
99+
return world.componentManager.getComponents(this);
100100
}
101101

102102
/**
@@ -105,12 +105,12 @@ class Entity
105105
* @return
106106
*/
107107

108-
public function getComponent( componentClass:Class<Component>):Component
108+
public inline function getComponent(componentClass:Class<Component>):Component
109109
{
110110
return world.componentManager.getComponentByClass( this, componentClass);
111111
}
112112

113-
public function getComponentByType( componentType:IComponentType):Component
113+
public inline function getComponentByType(componentType:IComponentType):Component
114114
{
115115
return world.componentManager.getComponentByType( this, componentType);
116116
}
@@ -120,7 +120,7 @@ class Entity
120120
* @param component
121121
*/
122122

123-
public function removeComponent( component:Component ):Void
123+
public inline function removeComponent(component:Component):Void
124124
{
125125
world.componentManager.removeComponentByClass( this, Type.getClass( component));
126126
}
@@ -130,12 +130,12 @@ class Entity
130130
* @param componentClass
131131
*/
132132

133-
public function removeComponentByClass( componentClass:Class<Component> ):Void
133+
public inline function removeComponentByClass(componentClass:Class<Component>):Void
134134
{
135135
world.componentManager.removeComponentByClass( this, componentClass);
136136
}
137137

138-
public function removeComponentByType( componentType:IComponentType ):Void
138+
public inline function removeComponentByType(componentType:IComponentType):Void
139139
{
140140
world.componentManager.removeComponentByType( this, componentType);
141141
}
@@ -145,22 +145,22 @@ class Entity
145145
* @param component
146146
*/
147147

148-
public function deleteComponent( component:Component ):Void
148+
public inline function deleteComponent(component:Component ):Void
149149
{
150-
world.componentManager.deleteComponentByClass( this, Type.getClass( component));
150+
world.componentManager.deleteComponentByClass(this, Type.getClass( component));
151151
}
152152

153153
/**
154154
* Removes the component by type of component rather than reference.
155155
* @param componentClass
156156
*/
157157

158-
public function deleteComponentByClass( componentClass:Class<Component> ):Void
158+
public inline function deleteComponentByClass(componentClass:Class<Component> ):Void
159159
{
160160
world.componentManager.deleteComponentByClass( this, componentClass);
161161
}
162162

163-
public function deleteComponentByType( componentType:IComponentType ):Void
163+
public inline function deleteComponentByType(componentType:IComponentType ):Void
164164
{
165165
world.componentManager.deleteComponentByType( this, componentType);
166166
}
@@ -170,28 +170,33 @@ class Entity
170170
* @param tag the id.
171171
*/
172172

173-
public function setTag( tag:String):Void
173+
public inline function setTag(tag:String):Void
174174
{
175-
world.tags.set( id, tag);
175+
world.setTag(this, tag);
176+
}
177+
178+
public inline function removeTag():Void
179+
{
180+
world.removeTag(this);
176181
}
177182

178183
/**
179184
* Get this entity's tag.
180185
* @return returns null if it has not been tagged!
181186
*/
182187

183-
public function getTag():String
188+
public inline function getTag():String
184189
{
185-
return world.tags.get( id);
190+
return world.getTag(this);
186191
}
187192

188193
/**
189194
* Destroy this entity!
190195
*/
191196

192-
public function destroy():Void
197+
public inline function destroy():Void
193198
{
194-
world.destroyEntity( this);
199+
world.destroyEntity(this);
195200
}
196201

197202
/**

‎src/hxE/EntityManager.hx

+13-20
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class EntityManager
2121

2222
private var world:EntityWorld;
2323

24-
public function new( world:EntityWorld)
24+
public function new(world:EntityWorld)
2525
{
2626
freeEnt = new GenericStack<Entity>();
2727
usedEnt = new GenericStack<Entity>();
@@ -38,29 +38,20 @@ class EntityManager
3838
return nid;
3939
}
4040

41-
public function destroyAll():Void
41+
public inline function destroyAll():Void
4242
{
43-
for ( e in usedEnt )
44-
{
45-
destroy( e );
46-
}
43+
for (e in usedEnt) destroy(e);
4744
}
4845

4946
public function create():Entity
5047
{
5148
var e:Entity;
52-
if ( freeEnt.isEmpty())
53-
{
54-
e = new Entity( getNextId(), world);
55-
}
56-
else
57-
{
58-
e = freeEnt.pop();
59-
}
49+
if (freeEnt.isEmpty()) e = new Entity(getNextId(), world);
50+
else e = freeEnt.pop();
6051

6152
e.activate();
6253

63-
usedEnt.add( e);
54+
usedEnt.add(e);
6455

6556
return e;
6657
}
@@ -70,20 +61,22 @@ class EntityManager
7061
return usedEnt.list();
7162
}
7263

73-
public function destroy( e:Entity ):Void
64+
public function destroy(e:Entity):Void
7465
{
66+
world.removeTag(e);
67+
7568
var components = e.getComponentIterator();
7669

77-
for ( component in components)
70+
for (component in components)
7871
{
79-
e.removeComponent( component);
72+
e.removeComponent(component);
8073
}
8174

8275
e.update();
8376
e.deactivate();
8477

85-
usedEnt.remove( e);
86-
freeEnt.add( e);
78+
usedEnt.remove(e);
79+
freeEnt.add(e);
8780
}
8881

8982
}

0 commit comments

Comments
 (0)