Changeset 567

Show
Ignore:
Timestamp:
05/24/08 10:55:52 (8 months ago)
Author:
LeoD
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/defend/Camera.d

    r561 r567  
    1616import gen.util.Wrapper; 
    1717 
    18 import defend.objects.Core; 
     18import defend.sim.Core; 
    1919import defend.terrain.Patch; 
    2020import defend.terrain.Terrain; 

  • trunk/src/defend/Graphics.d

    r562 r567  
    1919import defend.Config : defendConfig; 
    2020import defend.Camera : MainCamera; 
    21 import defend.objects.Core : GameObjectManager; 
    22 import defend.objects.SceneNode : GameObjectMesh; 
     21import defend.sim.Core : GameObjectManager; 
     22import defend.sim.SceneNode : GameObjectMesh; 
    2323 
    2424// Class for setting up all the graphics stuff 

  • trunk/src/defend/Main.d

    r565 r567  
    3232import defend.game.Config : GameMode, GameConfig, gameConfig; 
    3333import defend.mp.Player : PlayerInfo; 
    34 import defend.objects.Import; 
    35 import defend.objects.Core; 
     34import defend.sim.Import; 
     35import defend.sim.Core; 
    3636 
    3737class ArgumentException : Exception 

  • trunk/src/defend/demo/Demo.d

    r566 r567  
    1616import defend.Graphics; 
    1717import defend.Camera; 
    18 import defend.Simulation; 
    1918import defend.demo.Player; 
    20 import defend.objects.Core; 
     19import defend.sim.Simulation; 
     20import defend.sim.Core; 
    2121import defend.mp.Gateway; 
    2222import defend.mp.PlayerManager; 
    …… 
    6464 
    6565    void init() 
    66     {   
     66    { 
    6767        demoPlayer = new DemoPlayer(demoFile); 
    6868        demoPlayer.TerrainInformation.connect(&onTerrainInformation); 
    …… 
    7979        assert(terrain !is null); 
    8080         
    81         fogOfWar = new FogOfWar(gameObjects, terrain.lightmapTexture, vec2i.from(terrain.dimension)); 
     81        fogOfWar = new FogOfWar(gameObjects, terrain.lightmapTexture, vec2i.from(terrain.dimension), false); 
    8282 
    8383        taskManager.addRepeatedTask(&InputChannel.global.update, 100); 

  • trunk/src/defend/demo/Player.d

    r564 r567  
    1313import defend.Config; 
    1414import defend.demo.Chunks; 
    15 import defend.objects.Core; 
    16 import defend.objects.types.Unit; 
     15import defend.sim.Core; 
     16import defend.sim.obj.Unit; 
    1717 
    1818class DemoPlayer : Gateway 

  • trunk/src/defend/game/Game.d

    r566 r567  
    1818import gen.util.GameState; 
    1919 
    20 import defend.Simulation; 
    2120import defend.Config; 
    2221import defend.Graphics; 
    …… 
    2827import defend.game.net.Client; 
    2928import defend.game.net.Server; 
    30 import defend.objects.Core; 
     29import defend.sim.Simulation; 
     30import defend.sim.Core; 
    3131import defend.terrain.Heightmap; 
    3232import defend.terrain.Terrain; 

  • trunk/src/defend/game/hud/Hud.d

    r563 r567  
    2727 
    2828import defend.Config; 
    29 import defend.objects.Core; 
     29import defend.sim.Core; 
    3030import defend.game.hud.Mouse; 
    3131import defend.game.hud.MiniMap; 

  • trunk/src/defend/game/hud/MiniMap.d

    r566 r567  
    1919 
    2020import defend.Config; 
    21 import defend.objects.Core; 
     21import defend.sim.Core; 
    2222import defend.terrain.FogOfWar; 
    2323import defend.terrain.Terrain; 

  • trunk/src/defend/game/hud/Mouse.d

    r565 r567  
    2929import defend.Camera; 
    3030import defend.mp.Types; 
    31 import defend.objects.Core; 
     31import defend.sim.Core; 
    3232import defend.game.hud.MiniMap; 
    3333import defend.terrain.Map; 

  • trunk/src/defend/sim/Core.d

    r565 r567  
    1 module defend.objects.Core; 
     1module defend.sim.Core; 
    22 
    33import tango.io.Stdout; 
    …… 
    2626import gen.util.Profiler; 
    2727 
    28 import defend.Simulation; 
     28import defend.Config; 
    2929import defend.terrain.Map; 
    30 import defend.Config; 
     30import defend.sim.Effector; 
     31import defend.sim.Simulation; 
    3132import defend.mp.PlayerManager; 
    3233import defend.mp.Types; 
    3334import defend.mp.Phase; 
    3435import defend.mp.Gateway; 
    35 import defend.objects.Effector; 
    3636 
    3737// TODO: Find a way to split this file into multiple files, without circular imports. 

  • trunk/src/defend/sim/Effector.d

    r542 r567  
    1 module defend.objects.Effector; 
     1module defend.sim.Effector; 
    22 
    33public import xf.omg.core.Fixed; 

  • trunk/src/defend/sim/Import.d

    r491 r567  
    1 module defend.objects.Import; 
     1module defend.sim.Import; 
    22 
    33// needed for rebuild to compile and link these files 
    4 import defend.objects.types.Sheep; 
    5 import defend.objects.types.Building; 
    6 import defend.objects.types.House; 
    7 import defend.objects.types.Unit; 
    8 import defend.objects.types.Citizen; 
    9 import defend.objects.types.Resource; 
    10 import defend.objects.civs.Test; 
    11 import defend.objects.civs.Neutral; 
     4import defend.sim.obj.Sheep; 
     5import defend.sim.obj.Building; 
     6import defend.sim.obj.House; 
     7import defend.sim.obj.Unit; 
     8import defend.sim.obj.Citizen; 
     9import defend.sim.obj.Resource; 
     10import defend.sim.civs.Test; 
     11import defend.sim.civs.Neutral; 

  • trunk/src/defend/sim/SceneNode.d

    r566 r567  
    1 module defend.objects.SceneNode; 
     1module defend.sim.SceneNode; 
    22 
    33import gen.util.Memory; 

  • trunk/src/defend/sim/Simulation.d

    r564 r567  
    1 module defend.Simulation; 
     1module defend.sim.Simulation; 
    22 
    33// System libraries 

  • trunk/src/defend/sim/civs/Neutral.d

    r452 r567  
    1 module defend.objects.civs.Neutral; 
     1module defend.sim.civs.Neutral; 
    22 
    3 import defend.objects.Core; 
     3import defend.sim.Core; 
    44 
    55// Civilisation for neutral "player" 

  • trunk/src/defend/sim/civs/Test.d

    r491 r567  
    1 module defend.objects.civs.Test; 
     1module defend.sim.civs.Test; 
    22 
    33import gen.util.Array; 
    44 
    5 import defend.objects.Core; 
    6 import defend.objects.types.Unit; 
    7 import defend.objects.types.Citizen; 
    8 import defend.objects.types.Building; 
     5import defend.sim.Core; 
     6import defend.sim.obj.Unit; 
     7import defend.sim.obj.Citizen; 
     8import defend.sim.obj.Building; 
    99 
    1010static this() 

  • trunk/src/defend/sim/types/Building.d

    r565 r567  
    1 module defend.objects.types.Building; 
     1module defend.sim.obj.Building; 
    22 
    33import tango.io.Stdout; 
    …… 
    2121import defend.terrain.Map; 
    2222import defend.terrain.Terrain; 
    23 import defend.objects.Core; 
    24 import defend.objects.SceneNode; 
    25 import defend.objects.Effector; 
    26 import defend.objects.types.Unit; 
     23import defend.sim.Core; 
     24import defend.sim.SceneNode; 
     25import defend.sim.Effector; 
     26import defend.sim.obj.Unit; 
    2727 
    2828static this() 

  • trunk/src/defend/sim/types/Citizen.d

    r564 r567  
    1 module defend.objects.types.Citizen; 
     1module defend.sim.obj.Citizen; 
    22 
    33import tango.io.Stdout; 
    …… 
    99import defend.mp.Types; 
    1010import defend.mp.PlayerManager; 
    11 import defend.objects.Core; 
    12 import defend.objects.Effector; 
    13 import defend.objects.types.Unit; 
    14 import defend.objects.types.Resource; 
    15 import defend.objects.types.Building; 
     11import defend.sim.Core; 
     12import defend.sim.Effector; 
     13import defend.sim.obj.Unit; 
     14import defend.sim.obj.Resource; 
     15import defend.sim.obj.Building; 
    1616 
    1717//debug = citizen; 

  • trunk/src/defend/sim/types/House.d

    r562 r567  
    1 module defend.objects.types.House; 
     1module defend.sim.obj.House; 
    22 
    33import tango.io.Stdout; 
    …… 
    66import gen.model.Model; 
    77 
    8 import defend.objects.Core; 
    9 import defend.objects.types.Building; 
     8import defend.sim.Core; 
     9import defend.sim.obj.Building; 
    1010 
    1111static this() 

  • trunk/src/defend/sim/types/Resource.d

    r564 r567  
    1 module defend.objects.types.Resource; 
     1module defend.sim.obj.Resource; 
    22 
    33import gen.math.Vector; 
    …… 
    99import defend.terrain.Terrain; 
    1010import defend.mp.PlayerManager; 
    11 import defend.objects.Core; 
    12 import defend.objects.SceneNode; 
     11import defend.sim.Core; 
     12import defend.sim.SceneNode; 
    1313 
    1414static this() 

  • trunk/src/defend/sim/types/Sheep.d

    r551 r567  
    1 module defend.objects.types.Sheep; 
     1module defend.sim.obj.Sheep; 
    22 
    33import gen.scene.Graph; 
    …… 
    1313 
    1414import defend.terrain.Terrain; 
    15 import defend.objects.Core; 
    16 import defend.objects.types.Unit; 
     15import defend.sim.Core; 
     16import defend.sim.obj.Unit; 
    1717 
    1818static this() 

  • trunk/src/defend/sim/types/Unit.d

    r565 r567  
    1 module defend.objects.types.Unit; 
     1module defend.sim.obj.Unit; 
    22 
    33import tango.io.Stdout; 
    …… 
    2424import defend.terrain.Map; 
    2525import defend.terrain.Terrain; 
    26 import defend.objects.Core; 
    27 import defend.objects.SceneNode; 
    28 import defend.objects.Effector; 
     26import defend.sim.Core; 
     27import defend.sim.SceneNode; 
     28import defend.sim.Effector; 
    2929 
    3030//debug = unit; 

  • trunk/src/defend/terrain/FogOfWar.d

    r566 r567  
    1414import gen.math.Misc : clamp; 
    1515 
    16 import defend.objects.Core; 
     16import defend.sim.Core; 
    1717 
    1818class FogOfWar 

  • trunk/src/defend/terrain/Generator.d

    r565 r567  
    1010import defend.mp.PlayerManager; 
    1111import defend.terrain.Heightmap; 
    12 import defend.objects.Core; 
     12import defend.sim.Core; 
    1313 
    1414alias void function(TerrainInfo terrainInfo, 

  • trunk/src/windefend.cbp

    r566 r567  
    9999        <Unit filename="defend\Graphics.d" /> 
    100100        <Unit filename="defend\Main.d" /> 
    101         <Unit filename="defend\Simulation.d" /> 
    102101        <Unit filename="defend\demo\Chunks.d" /> 
    103102        <Unit filename="defend\demo\Demo.d" /> 
    …… 
    119118        <Unit filename="defend\mp\TerrainInfo.d" /> 
    120119        <Unit filename="defend\mp\Types.d" /> 
    121         <Unit filename="defend\objects\Core.d" /> 
    122         <Unit filename="defend\objects\Effector.d" /> 
    123         <Unit filename="defend\objects\Import.d" /> 
    124         <Unit filename="defend\objects\SceneNode.d" /> 
    125         <Unit filename="defend\objects\civs\Neutral.d" /> 
    126         <Unit filename="defend\objects\civs\Test.d" /> 
    127         <Unit filename="defend\objects\types\Building.d" /> 
    128         <Unit filename="defend\objects\types\Citizen.d" /> 
    129         <Unit filename="defend\objects\types\House.d" /> 
    130         <Unit filename="defend\objects\types\Resource.d" /> 
    131         <Unit filename="defend\objects\types\Sheep.d" /> 
    132         <Unit filename="defend\objects\types\Unit.d" /> 
     120        <Unit filename="defend\sim\Core.d" /> 
     121        <Unit filename="defend\sim\Effector.d" /> 
     122        <Unit filename="defend\sim\Import.d" /> 
     123        <Unit filename="defend\sim\SceneNode.d" /> 
     124        <Unit filename="defend\sim\Simulation.d" /> 
     125        <Unit filename="defend\sim\civs\Neutral.d" /> 
     126        <Unit filename="defend\sim\civs\Test.d" /> 
    133127        <Unit filename="defend\terrain\FogOfWar.d" /> 
    134128        <Unit filename="defend\terrain\Generator.d" />