Changeset 565

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

moving is fun

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/defend/Main.d

    r564 r565  
    4848 
    4949    // Print a header to the console 
    50     Stdout.formatln("{} {} (built {})", DEFEND_NAME, DEFEND_VERSION, __DATE__); 
     50    Stdout.formatln("{} {} (built {})\n", DEFEND_NAME, DEFEND_VERSION, __DATE__); 
    5151 
    5252    // Spam :P 
    53     Log.defaultLevel = LogLevel.Spam; 
     53    Log.defaultLevel = LogLevel.Info; 
    5454 
    5555    // Load the config 

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

    r564 r565  
    1414import gen.util.GameState; 
    1515 
    16 import defend.Map; 
    1716import defend.Graphics; 
    18 import defend.MapGenerator; 
    1917import defend.Camera; 
    2018import defend.FogOfWar; 
    2119import defend.Simulation; 
     20import defend.demo.Player; 
     21import defend.objects.Core; 
    2222import defend.mp.Gateway; 
    2323import defend.mp.PlayerManager; 
    24 import defend.demo.Player; 
    25 import defend.objects.Core; 
     24import defend.terrain.Map; 
     25import defend.terrain.Generator; 
    2626import defend.terrain.Terrain; 
    2727import defend.terrain.Heightmap; 

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

    r564 r565  
    1818import gen.util.GameState; 
    1919 
    20 import defend.Map; 
    2120import defend.Simulation; 
    2221import defend.Config; 
    2322import defend.Graphics; 
    2423import defend.FogOfWar; 
    25 import defend.MapGenerator; 
    2624import defend.mp.Gateway; 
    2725import defend.mp.PlayerManager; 
    …… 
    3432import defend.terrain.Heightmap; 
    3533import defend.terrain.Terrain; 
     34import defend.terrain.Map; 
     35import defend.terrain.Generator; 
    3636 
    3737// List of defend globals 
    38 // defend.Map : map 
     38// defend.terrain.Map : map 
    3939// defend.FogOfWar : fogOfWar 
    4040// defend.terrain.Terrain : terrain 

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

    r564 r565  
    2626import gen.gui.Controller; 
    2727 
    28 import defend.Map; 
    2928import defend.Config; 
    3029import defend.Camera; 
    3130import defend.mp.Types; 
     31import defend.objects.Core; 
     32import defend.game.hud.MiniMap; 
     33import defend.terrain.Map; 
    3234import defend.terrain.Terrain; 
    3335import defend.terrain.Patch; 
    34 import defend.objects.Core; 
    35 import defend.game.hud.MiniMap; 
    3636 
    3737class Mouse 

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

    r564 r565  
    2727 
    2828import defend.Simulation; 
    29 import defend.Map; 
     29import defend.terrain.Map; 
    3030import defend.Config; 
    3131import defend.mp.PlayerManager; 

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

    r564 r565  
    1717import gen.math.Ray; 
    1818 
    19 import defend.Map; 
    2019import defend.Config : playerColors; 
    2120import defend.mp.Types; 
     21import defend.terrain.Map; 
    2222import defend.terrain.Terrain; 
    2323import defend.objects.Core; 

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

    r564 r565  
    2020import gen.sound.SoundSystem; 
    2121 
    22 import defend.Map; 
    2322import defend.Config; 
    2423import defend.mp.Types; 
     24import defend.terrain.Map; 
    2525import defend.terrain.Terrain; 
    2626import defend.objects.Core; 

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

    r564 r565  
    1 module defend.MapGenerator; 
     1module defend.terrain.Generator; 
    22 
    33import tango.math.Random; 

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

    r564 r565  
    1 module defend.Map; 
     1module defend.terrain.Map; 
    22 
    33import tango.io.Stdout; 

  • trunk/src/gen/rend/opengl/Renderer.d

    r563 r565  
    481481    override Texture createTexture(Image image) 
    482482    { 
    483         logger.info("creating {}*{} texture (from {})", image.width, image.height, 
    484                     image.file ? "\"" ~ image.file ~ "\"" : "an image"); 
     483        //logger.trace("creating {}*{} texture (from {})", image.width, image.height, 
     484        //             image.file ? "\"" ~ image.file ~ "\"" : "an image"); 
    485485     
    486486        return new OGLTexture(image); 
    …… 
    489489    override Texture createTexture(vec2i dimension, ImageFormat format) 
    490490    { 
    491         logger.info("creating {}*{} texture render target", dimension.x, dimension.y); 
     491        //logger.trace("creating {}*{} texture render target", dimension.x, dimension.y); 
    492492     
    493493        return new OGLTexture(dimension, format); 
    …… 
    540540    override Framebuffer createFramebuffer(vec2i dimension, ImageFormat format = ImageFormat.RGB) 
    541541    { 
    542         logger.info("creating {}*{} framebuffer", dimension.x, dimension.y); 
     542        //logger.info("creating {}*{} framebuffer", dimension.x, dimension.y); 
    543543     
    544544        return new FBO(cast(OGLTexture)createTexture(dimension, format)); 
    …… 
    613613    override Shader createShader(Config config) 
    614614    { 
    615         logger.info("creating shader from config file \"{}\"", config.file); 
     615        //logger.trace("creating shader from config file \"{}\"", config.file); 
    616616         
    617617        return new OGLShader(config); 
    …… 
    620620    override Shader createShader(char[] file) 
    621621    { 
    622         logger.info("creating shader from \"{}\"", file); 
     622        //logger.trace("creating shader from \"{}\"", file); 
    623623     
    624624        return new OGLShader(file); 

  • trunk/src/gen/util/Resource.d

    r542 r565  
    2929        if(auto instance = file in instances) 
    3030            return *instance; 
    31  
     31         
    3232        logger.info("loading `{}'", file); 
    3333 
    …… 
    7373        { 
    7474            char[] file = instance.file; 
     75            logger.info("releasing `{}'", file); 
    7576         
    7677            delete instance; 

  • trunk/src/gen/util/UnitTest.d

    r422 r565  
    2626// 'which' specifies which unit tests shall be invoked (e.g. "gen") 
    2727// 'not' specifies which unit tests shall not be invoked (e.g. "gen.util") 
    28 bool runTests(in char[][] which, in char[][] not) 
     28bool runTests(char[][] which, char[][] not) 
    2929{ 
    3030    uint failed; // Number of failed tests 
    …… 
    3535     
    3636    // Run one unittest and print out its result 
    37     void test(in char[] name, in void function() f) 
     37    void test(char[] name, void function() f) 
    3838    { 
    3939        Stdout(name)(" - ")(); 
    …… 
    6868     
    6969    // Test if one string is included in the beginning of an array of strings 
    70     static bool includes(in char[] search, in char[][] where) 
     70    static bool includes(char[] search, char[][] where) 
    7171    { 
    7272        foreach(what; where) 

  • trunk/src/windefend.cbp

    r564 r565  
    100100        <Unit filename="defend\Graphics.d" /> 
    101101        <Unit filename="defend\Main.d" /> 
    102         <Unit filename="defend\Map.d" /> 
    103         <Unit filename="defend\MapGenerator.d" /> 
    104102        <Unit filename="defend\Simulation.d" /> 
    105103        <Unit filename="defend\demo\Chunks.d" /> 
    …… 
    134132        <Unit filename="defend\objects\types\Sheep.d" /> 
    135133        <Unit filename="defend\objects\types\Unit.d" /> 
     134        <Unit filename="defend\terrain\Generator.d" /> 
    136135        <Unit filename="defend\terrain\Heightmap.d" /> 
     136        <Unit filename="defend\terrain\Map.d" /> 
    137137        <Unit filename="defend\terrain\Patch.d" /> 
    138138        <Unit filename="defend\terrain\Ranges.d" />