mirror of
https://github.com/cyberarm/i-mic-fps.git
synced 2025-12-15 15:42:35 +00:00
Removed entity management from Game, refactored Map to MapLoader and added Map to manage world
This commit is contained in:
@@ -2,12 +2,12 @@ class IMICFPS
|
||||
module EntityManager # Get included into GameState context
|
||||
def add_entity(entity)
|
||||
@collision_manager.add(entity)# Add every entity to collision manager
|
||||
@publisher.publish(:create, self, entity)
|
||||
Publisher.instance.publish(:create, nil, entity)
|
||||
@entities << entity
|
||||
end
|
||||
|
||||
def insert_entity(package, name, position, orientation, data = {})
|
||||
ent = Map::Entity.new(package, name, position, orientation, Vector.new(1,1,1))
|
||||
ent = MapLoader::Entity.new(package, name, position, orientation, Vector.new(1,1,1))
|
||||
add_entity(IMICFPS::Entity.new(map_entity: ent, manifest: Manifest.new(package: package, name: name)))
|
||||
end
|
||||
|
||||
@@ -15,11 +15,15 @@ class IMICFPS
|
||||
@entities.detect {|entity| entity == entity}
|
||||
end
|
||||
|
||||
def find_entity_by(name:)
|
||||
@entities.detect { |entity| entity.name == name}
|
||||
end
|
||||
|
||||
def remove_entity(entity)
|
||||
ent = @entities.detect {|entity| entity == entity}
|
||||
if ent
|
||||
@collision_manager.remove(entity)
|
||||
@publisher.publish(:destroy, self, entity)
|
||||
@publisher.publish(:destroy, nil, entity)
|
||||
@entities.delete(ent)
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user