Changeset 583

Show
Ignore:
Timestamp:
05/29/08 14:29:44 (7 months ago)
Author:
LeoD
Message:

renaming: gen -> engine

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/defend/Camera.d

    r580 r583  
    44import tango.math.Math; 
    55 
    6 import gen.input.Input; 
    7 import gen.math.Frustum; 
    8 import gen.math.Matrix; 
    9 import gen.math.Ray; 
    10 import gen.math.Rectangle; 
    11 import gen.math.Vector; 
    12 import gen.rend.Renderer; 
    13 import gen.rend.Window; 
    14 import gen.scene.Camera; 
    15 import gen.util.Memory; 
    16 import gen.util.Wrapper; 
     6import engine.input.Input; 
     7import engine.math.Frustum; 
     8import engine.math.Matrix; 
     9import engine.math.Ray; 
     10import engine.math.Rectangle; 
     11import engine.math.Vector; 
     12import engine.rend.Renderer; 
     13import engine.rend.Window; 
     14import engine.scene.Camera; 
     15import engine.util.Memory; 
     16import engine.util.Wrapper; 
    1717 
    1818import defend.sim.Core; 
  • trunk/src/defend/Config.d

    r544 r583  
    33import tango.io.FilePath; 
    44 
    5 import gen.math.Vector; 
    6 import gen.util.CompileTime; 
    7 import gen.util.Config; 
     5import engine.math.Vector; 
     6import engine.util.CompileTime; 
     7import engine.util.Config; 
    88 
    99const DEFEND_NAME = "Defend"; 
  • trunk/src/defend/Graphics.d

    r567 r583  
    44import tango.math.Math; 
    55 
    6 import gen.core.TaskManager; 
    7 import gen.util.Sprite; 
    8 import gen.util.Profiler; 
    9 import gen.image.Image; 
    10 import gen.math.Vector; 
    11 import gen.rend.Renderer; 
    12 import gen.rend.Shader; 
    13 import gen.rend.opengl.Wrapper; 
    14 import gen.scene.Graph; 
    15 import gen.scene.MeshNode; 
    16 import gen.scene.StaticCamera; 
    17 import gen.scene.ParticleSystem; 
     6import engine.core.TaskManager; 
     7import engine.util.Sprite; 
     8import engine.util.Profiler; 
     9import engine.image.Image; 
     10import engine.math.Vector; 
     11import engine.rend.Renderer; 
     12import engine.rend.Shader; 
     13import engine.rend.opengl.Wrapper; 
     14import engine.scene.Graph; 
     15import engine.scene.MeshNode; 
     16import engine.scene.StaticCamera; 
     17import engine.scene.ParticleSystem; 
    1818 
    1919import defend.Config : defendConfig; 
  • trunk/src/defend/Main.d

    r579 r583  
    1111import tango.math.Random; 
    1212 
    13 import gen.core.TaskManager : TaskManager, taskManager; 
    14 import gen.math.Vector : vec2i, vec3; 
    15 import gen.model.Model : Model; 
    16 import gen.input.Input : InputChannel; 
    17 import gen.input.SDL : SDLInputWriter; 
    18 import gen.rend.Renderer : RendererConfig, Shader, Renderer, renderer; 
    19 import gen.rend.opengl.Renderer : OGLRenderer; 
    20 import gen.scene.Graph : SceneGraph, sceneGraph; 
    21 import gen.sound.SoundSystem : SoundSystem, soundSystem; 
    22 import gen.sound.openal.SoundSystem : OALSoundSystem; 
    23 import gen.util.FPS : FPSCounter; 
    24 import gen.util.Log : Log, Logger, LogLevel; 
    25 import gen.util.HardwareTimer : HardwareTimer; 
    26 import gen.util.Config : Config; 
    27 import gen.util.GameState : gameState; 
    28 import gen.util.Resource : Resource; 
     13import engine.core.TaskManager : TaskManager, taskManager; 
     14import engine.math.Vector : vec2i, vec3; 
     15import engine.model.Model : Model; 
     16import engine.input.Input : InputChannel; 
     17import engine.input.SDL : SDLInputWriter; 
     18import engine.rend.Renderer : RendererConfig, Shader, Renderer, renderer; 
     19import engine.rend.opengl.Renderer : OGLRenderer; 
     20import engine.scene.Graph : SceneGraph, sceneGraph; 
     21import engine.sound.SoundSystem : SoundSystem, soundSystem; 
     22import engine.sound.openal.SoundSystem : OALSoundSystem; 
     23import engine.util.FPS : FPSCounter; 
     24import engine.util.Log : Log, Logger, LogLevel; 
     25import engine.util.HardwareTimer : HardwareTimer; 
     26import engine.util.Config : Config; 
     27import engine.util.GameState : gameState; 
     28import engine.util.Resource : Resource; 
    2929 
    3030import defend.Config : defendConfig, RuntimeException, DEFEND_NAME, DEFEND_VERSION; 
  • trunk/src/defend/demo/Demo.d

    r574 r583  
    44import tango.io.Stdout; 
    55 
    6 import gen.core.TaskManager; 
    7 import gen.input.Input; 
    8 import gen.font.FreeType; 
    9 import gen.math.Matrix; 
    10 import gen.math.Vector; 
    11 import gen.rend.Renderer; 
    12 import gen.scene.Graph; 
    13 import gen.scene.MeshNode; 
    14 import gen.util.GameState; 
     6import engine.core.TaskManager; 
     7import engine.input.Input; 
     8import engine.font.FreeType; 
     9import engine.math.Matrix; 
     10import engine.math.Vector; 
     11import engine.rend.Renderer; 
     12import engine.scene.Graph; 
     13import engine.scene.MeshNode; 
     14import engine.util.GameState; 
    1515 
    1616import defend.Graphics; 
  • trunk/src/defend/demo/Player.d

    r581 r583  
    55import tango.text.Util; 
    66 
    7 import gen.math.Vector; 
    8 import gen.util.Log; 
    9 import gen.util.Wrapper; 
    10 import gen.util.Serialize; 
     7import engine.math.Vector; 
     8import engine.util.Log; 
     9import engine.util.Wrapper; 
     10import engine.util.Serialize; 
    1111 
    1212import defend.mp.Gateway; 
  • trunk/src/defend/demo/Recorder.d

    r564 r583  
    44import tango.io.Stdout; 
    55 
    6 import gen.util.Memory; 
    7 import gen.util.Wrapper; 
    8 import gen.util.Serialize; 
     6import engine.util.Memory; 
     7import engine.util.Wrapper; 
     8import engine.util.Serialize; 
    99 
    1010import defend.mp.Gateway; 
  • trunk/src/defend/game/Game.d

    r582 r583  
    77import Integer = tango.text.convert.Integer; 
    88 
    9 import gen.core.TaskManager; 
    10 import gen.input.Input; 
    11 import gen.rend.Renderer; 
    12 import gen.scene.Graph; 
    13 import gen.scene.StaticCamera; 
    14 import gen.sound.SoundSystem; 
    15 import gen.util.Log; 
    16 import gen.util.Memory; 
    17 import gen.util.Profiler; 
    18 import gen.util.GameState; 
    19 import gen.util.Resource; 
     9import engine.core.TaskManager; 
     10import engine.input.Input; 
     11import engine.rend.Renderer; 
     12import engine.scene.Graph; 
     13import engine.scene.StaticCamera; 
     14import engine.sound.SoundSystem; 
     15import engine.util.Log; 
     16import engine.util.Memory; 
     17import engine.util.Profiler; 
     18import engine.util.GameState; 
     19import engine.util.Resource; 
    2020 
    2121import defend.Config; 
  • trunk/src/defend/game/hud/Console.d

    r465 r583  
    11module defend.game.hud.Console; 
    22 
    3 import gen.input.Input; 
    4 import gen.rend.Renderer; 
     3import engine.input.Input; 
     4import engine.rend.Renderer; 
    55 
    66class HUDConsole 
  • trunk/src/defend/game/hud/Hud.d

    r567 r583  
    55import Float = tango.text.convert.Float; 
    66 
    7 import gen.util.Memory; 
    8 import gen.util.FPS; 
    9 import gen.util.Bind; 
    10 import gen.util.Bind; 
    11 import gen.util.Statistics; 
    12 import gen.util.ProfilingDisplay; 
    13 import gen.math.Misc; 
    14 import gen.math.Vector; 
    15 import gen.math.Rectangle; 
    16 import gen.rend.Renderer; 
    17 import gen.rend.opengl.Wrapper; 
    18 import gen.sound.SoundSystem; 
    19 import gen.sound.Source; 
    20 import gen.gui.Controller; 
    21 import gen.gui.Widget; 
    22 import gen.gui.Button; 
    23 import gen.gui.Window; 
    24 import gen.font.Font; 
    25 import gen.font.FreeType; 
    26 import gen.input.Input; 
     7import engine.util.Memory; 
     8import engine.util.FPS; 
     9import engine.util.Bind; 
     10import engine.util.Bind; 
     11import engine.util.Statistics; 
     12import engine.util.ProfilingDisplay; 
     13import engine.math.Misc; 
     14import engine.math.Vector; 
     15import engine.math.Rectangle; 
     16import engine.rend.Renderer; 
     17import engine.rend.opengl.Wrapper; 
     18import engine.sound.SoundSystem; 
     19import engine.sound.Source; 
     20import engine.gui.Controller; 
     21import engine.gui.Widget; 
     22import engine.gui.Button; 
     23import engine.gui.Window; 
     24import engine.font.Font; 
     25import engine.font.FreeType; 
     26import engine.input.Input; 
    2727 
    2828import defend.Config; 
  • trunk/src/defend/game/hud/MiniMap.d

    r582 r583  
    33import tango.io.Stdout; 
    44 
    5 import gen.core.TaskManager; 
    6 import gen.image.Image; 
    7 import gen.math.Rectangle; 
    8 import gen.math.Vector; 
    9 import gen.math.Matrix; 
    10 import gen.scene.Camera; 
    11 import gen.scene.StaticCamera; 
    12 import gen.scene.Graph; 
    13 import gen.rend.Renderer; 
    14 import gen.rend.Texture; 
    15 import gen.rend.opengl.Wrapper; 
    16 import gen.util.Memory; 
    17 import gen.util.Sprite; 
    18 import gen.util.Wrapper; 
     5import engine.core.TaskManager; 
     6import engine.image.Image; 
     7import engine.math.Rectangle; 
     8import engine.math.Vector; 
     9import engine.math.Matrix; 
     10import engine.scene.Camera; 
     11import engine.scene.StaticCamera; 
     12import engine.scene.Graph; 
     13import engine.rend.Renderer; 
     14import engine.rend.Texture; 
     15import engine.rend.opengl.Wrapper; 
     16import engine.util.Memory; 
     17import engine.util.Sprite; 
     18import engine.util.Wrapper; 
    1919 
    2020import defend.Config; 
  • trunk/src/defend/game/hud/Mouse.d

    r582 r583  
    33import tango.io.Stdout; 
    44 
    5 import gen.math.Ray; 
    6 import gen.math.Misc; 
    7 import gen.math.Vector; 
    8 import gen.math.Matrix; 
    9 import gen.math.Rectangle; 
    10 import gen.math.BoundingBox; 
    11 import gen.rend.Renderer; 
    12 import gen.rend.Texture; 
    13 import gen.rend.opengl.Wrapper; 
    14 import gen.scene.Camera; 
    15 import gen.scene.Graph; 
    16 import gen.scene.ModelNode; 
    17 import gen.util.Profiler; 
    18 import gen.util.Memory; 
    19 import gen.util.Signal; 
    20 import gen.util.Sprite; 
    21 import gen.util.Wrapper; 
    22 import gen.list.BufferedArray; 
    23 import gen.model.Model; 
    24 import gen.input.Input; 
    25 import gen.image.Devil; 
    26 import gen.gui.Controller; 
     5import engine.math.Ray; 
     6import engine.math.Misc; 
     7import engine.math.Vector; 
     8import engine.math.Matrix; 
     9import engine.math.Rectangle; 
     10import engine.math.BoundingBox; 
     11import engine.rend.Renderer; 
     12import engine.rend.Texture; 
     13import engine.rend.opengl.Wrapper; 
     14import engine.scene.Camera; 
     15import engine.scene.Graph; 
     16import engine.scene.ModelNode; 
     17import engine.util.Profiler; 
     18import engine.util.Memory; 
     19import engine.util.Signal; 
     20import engine.util.Sprite; 
     21import engine.util.Wrapper; 
     22import engine.list.BufferedArray; 
     23import engine.model.Model; 
     24import engine.input.Input; 
     25import engine.image.Devil; 
     26import engine.gui.Controller; 
    2727 
    2828import defend.Config; 
  • trunk/src/defend/game/net/Client.d

    r574 r583  
    99import Integer = tango.text.convert.Integer; 
    1010 
    11 import gen.util.Swap; 
    12 import gen.util.Log; 
    13 import gen.util.Signal; 
    14 import gen.util.Wrapper; 
    15 import gen.util.Memory; 
    16 import gen.util.Profiler; 
    17 import gen.util.FreeList; 
    18 import gen.list.Queue; 
    19 import gen.list.MoveQueue; 
    20 import gen.math.Vector; 
    21 import gen.net.tcp.Socket; 
     11import engine.util.Swap; 
     12import engine.util.Log; 
     13import engine.util.Signal; 
     14import engine.util.Wrapper; 
     15import engine.util.Memory; 
     16import engine.util.Profiler; 
     17import engine.util.FreeList; 
     18import engine.list.Queue; 
     19import engine.list.MoveQueue; 
     20import engine.math.Vector; 
     21import engine.net.tcp.Socket; 
    2222 
    2323import defend.Config; 
  • trunk/src/defend/game/net/Messages.d

    r564 r583  
    11module defend.game.net.Messages; 
    22 
    3 import gen.net.tcp.Message; 
     3import engine.net.tcp.Message; 
    44 
    55import defend.Config; 
  • trunk/src/defend/game/net/Server.d

    r564 r583  
    1010import Integer = tango.text.convert.Integer; 
    1111 
    12 import gen.util.Log; 
    13 import gen.util.Memory; 
    14 import gen.util.Profiler; 
    15 import gen.util.Wrapper; 
    16 import gen.math.Random; 
    17 import gen.math.Misc; 
    18 import gen.list.Queue; 
    19 import gen.list.MoveQueue; 
    20 import gen.net.tcp.Socket; 
     12import engine.util.Log; 
     13import engine.util.Memory; 
     14import engine.util.Profiler; 
     15import engine.util.Wrapper; 
     16import engine.math.Random; 
     17import engine.math.Misc; 
     18import engine.list.Queue; 
     19import engine.list.MoveQueue; 
     20import engine.net.tcp.Socket; 
    2121 
    2222import defend.Config; 
  • trunk/src/defend/mp/Gateway.d

    r564 r583  
    11module defend.mp.Gateway; 
    22 
    3 import gen.math.Vector; 
    4 import gen.util.Signal; 
     3import engine.math.Vector; 
     4import engine.util.Signal; 
    55 
    66public 
  • trunk/src/defend/mp/Phase.d

    r564 r583  
    33import tango.io.Stdout; 
    44 
    5 import gen.list.Queue; 
    6 import gen.util.MemoryPool; 
    7 import gen.util.Memory; 
     5import engine.list.Queue; 
     6import engine.util.MemoryPool; 
     7import engine.util.Memory; 
    88 
    99import defend.mp.Types; 
  • trunk/src/defend/mp/PlayerManager.d

    r564 r583  
    33import Integer = tango.text.convert.Integer; 
    44 
    5 import gen.util.Log; 
     5import engine.util.Log; 
    66 
    77import defend.mp.Gateway; 
  • trunk/src/defend/mp/Types.d

    r564 r583  
    11module defend.mp.Types; 
    22 
    3 public import gen.math.Vector; 
     3public import engine.math.Vector; 
    44 
    55alias ushort object_id_t; 
  • trunk/src/defend/sim/Core.d

    r582 r583  
    99import Integer = tango.text.convert.Integer; 
    1010 
    11 import gen.scene.Node; 
    12 import gen.list.IndexedArray; 
    13 import gen.list.Queue; 
    14 import gen.list.BufferedArray; 
    15 import gen.math.Vector; 
    16 import gen.math.Vector; 
    17 import gen.math.Ray; 
    18 import gen.math.Rectangle; 
    19 import gen.gui.Widget; 
    20 import gen.util.Log; 
    21 import gen.util.Singleton; 
    22 import gen.util.Serialize; 
    23 import gen.util.Signal; 
    24 import gen.util.Memory; 
    25 import gen.util.Signal; 
    26 import gen.util.Profiler; 
     11import engine.scene.Node; 
     12import engine.list.IndexedArray; 
     13import engine.list.Queue; 
     14import engine.list.BufferedArray; 
     15import engine.math.Vector; 
     16import engine.math.Vector; 
     17import engine.math.Ray; 
     18import engine.math.Rectangle; 
     19import engine.gui.Widget; 
     20import engine.util.Log; 
     21import engine.util.Singleton; 
     22import engine.util.Serialize; 
     23import engine.util.Signal; 
     24import engine.util.Memory; 
     25import engine.util.Signal; 
     26import engine.util.Profiler; 
    2727 
    2828import defend.Config; 
  • trunk/src/defend/sim/SceneNode.d

    r582 r583  
    11module defend.sim.SceneNode; 
    22 
    3 import gen.util.Memory; 
    4 import gen.image.Image; 
    5 import gen.list.Sort; 
    6 import gen.math.Vector; 
    7 import gen.math.BoundingBox; 
    8 import gen.scene.Node; 
    9 import gen.scene.Graph; 
    10 import gen.scene.Camera; 
    11 import gen.model.Model; 
    12 import gen.model.Mesh; 
    13 import gen.rend.Shader; 
    14 import gen.rend.Texture; 
    15 import gen.rend.Renderer; 
    16 import gen.rend.Framebuffer; 
     3import engine.util.Memory; 
     4import engine.image.Image; 
     5import engine.list.Sort; 
     6import engine.math.Vector; 
     7import engine.math.BoundingBox; 
     8import engine.scene.Node; 
     9import engine.scene.Graph; 
     10import engine.scene.Camera; 
     11import engine.model.Model; 
     12import engine.model.Mesh; 
     13import engine.rend.Shader; 
     14import engine.rend.Texture; 
     15import engine.rend.Renderer; 
     16import engine.rend.Framebuffer; 
    1717 
    1818import defend.Config; 
  • trunk/src/defend/sim/Simulation.d

    r569 r583  
    11module defend.sim.Simulation; 
    22 
    3 import gen.core.TaskManager; 
    4 import gen.util.Profiler; 
    5 import gen.util.Signal; 
     3import engine.core.TaskManager; 
     4import engine.util.Profiler; 
     5import engine.util.Signal; 
    66 
    77import defend.mp.Phase; 
  • trunk/src/defend/sim/civ/Test.d

    r581 r583  
    11module defend.sim.civ.Test; 
    22 
    3 import gen.util.Array; 
     3import engine.util.Array; 
    44 
    55import defend.sim.Core; 
  • trunk/src/defend/sim/obj/Building.d

    r581 r583  
    33import tango.io.Stdout; 
    44 
    5 import gen.model.Model; 
    6 import gen.rend.Renderer; 
    7 import gen.rend.opengl.Wrapper; 
    8 import gen.util.Memory; 
    9 import gen.util.Swap; 
    10 import gen.math.Misc; 
    11 import gen.scene.Node; 
    12 import gen.scene.Graph; 
    13 import gen.scene.ModelNode; 
    14 import gen.scene.ParticleSystem; 
    15 import gen.math.Rectangle; 
    16 import gen.math.Vector; 
    17 import gen.math.Ray; 
     5import engine.model.Model; 
     6import engine.rend.Renderer; 
     7import engine.rend.opengl.Wrapper; 
     8import engine.util.Memory; 
     9import engine.util.Swap; 
     10import engine.math.Misc; 
     11import engine.scene.Node; 
     12import engine.scene.Graph; 
     13import engine.scene.ModelNode; 
     14import engine.scene.ParticleSystem; 
     15import engine.math.Rectangle; 
     16import engine.math.Vector; 
     17import engine.math.Ray; 
    1818 
    1919import defend.Config : playerColors; 
  • trunk/src/defend/sim/obj/Citizen.d

    r581 r583  
    44import Integer = tango.text.convert.Integer; 
    55 
    6 import gen.util.Memory; 
    7 import gen.math.Vector; 
     6import engine.util.Memory; 
     7import engine.math.Vector; 
    88 
    99import defend.mp.Types; 
  • trunk/src/defend/sim/obj/House.d

    r581 r583  
    33import tango.io.Stdout; 
    44 
    5 import gen.math.Vector; 
    6 import gen.model.Model; 
     5import engine.math.Vector; 
     6import engine.model.Model; 
    77 
    88import defend.sim.Core; 
  • trunk/src/defend/sim/obj/Resource.d

    r576 r583  
    11module defend.sim.obj.Resource; 
    22 
    3 import gen.math.Vector; 
    4 import gen.math.Ray; 
    5 import gen.model.Model; 
    6 import gen.scene.Graph; 
    7 import gen.scene.Node; 
     3import engine.math.Vector; 
     4import engine.math.Ray; 
     5import engine.model.Model; 
     6import engine.scene.Graph; 
     7import engine.scene.Node; 
    88 
    99import defend.terrain.Terrain; 
  • trunk/src/defend/sim/obj/Sheep.d

    r581 r583  
    11module defend.sim.obj.Sheep; 
    22 
    3 import gen.scene.Graph; 
    4 import gen.scene.MeshNode; 
    5 import gen.math.Ray; 
    6 import gen.math.Vector; 
    7 import gen.math.Matrix; 
    8 import gen.math.BoundingBox; 
    9 import gen.input.Input; 
    10 import gen.scene.ModelNode; 
    11 import gen.model.Model; 
    12 import gen.util.Profiler; 
     3import engine.scene.Graph; 
     4import engine.scene.MeshNode; 
     5import engine.math.Ray; 
     6import engine.math.Vector; 
     7import engine.math.Matrix; 
     8import engine.math.BoundingBox; 
     9import engine.input.Input; 
     10import engine.scene.ModelNode; 
     11import engine.model.Model; 
     12import engine.util.Profiler; 
    1313 
    1414import defend.terrain.Terrain; 
  • trunk/src/defend/sim/obj/Unit.d

    r582 r583  
    55import Integer = tango.text.convert.Integer; 
    66 
    7 import gen.model.Model; 
    8 import gen.util.ArrayPool; 
    9 import gen.util.Signal; 
    10 import gen.util.Array; 
    11 import gen.util.Wrapper; 
    12 import gen.util.Memory; 
    13 import gen.math.Vector; 
    14 import gen.math.Matrix; 
    15 import gen.math.Ray; 
    16 import gen.scene.Node; 
    17 import gen.scene.Graph; 
    18 import gen.scene.ModelNode; 
    19 import gen.rend.Renderer; 
    20 import gen.sound.SoundSystem; 
     7import engine.model.Model; 
     8import engine.util.ArrayPool; 
     9import engine.util.Signal; 
     10import engine.util.Array; 
     11import engine.util.Wrapper; 
     12import engine.util.Memory; 
     13import engine.math.Vector; 
     14import engine.math.Matrix; 
     15import engine.math.Ray; 
     16import engine.scene.Node; 
     17import engine.scene.Graph; 
     18import engine.scene.ModelNode; 
     19import engine.rend.Renderer; 
     20import engine.sound.SoundSystem; 
    2121 
    2222import defend.Config; 
  • trunk/src/defend/terrain/FogOfWar.d

    r581 r583  
    33import tango.io.Stdout; 
    44 
    5 import gen.core.TaskManager; 
    6 import gen.rend.Renderer; 
    7