Ignore:
Timestamp:
04/11/06 09:20:23 (18 years ago)
Author:
igarcia
Message:
 
Location:
GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include
Files:
1 added
15 edited

Legend:

Unmodified
Added
Removed

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBC.h

    r700 r745  
    1111#include <BBCBillboard.h> 
    1212#include <BBCBillboardCloud.h> 
     13#include <BBCBillboardGroup.h> 
     14#include <BBCBillboardClusterData.h> 
    1315#include <BBCBillboardCloudGenerator.h> 
    1416#include <BBCEntityDistributionGenerator.h> 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBCBillboard.h

    r721 r745  
    3131  protected: 
    3232    unsigned int mBillboardHandle; 
    33  
    3433 
    3534  public: 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBCBillboardCloudSerializer.h

    r721 r745  
    3030        BillboardCloud * getBillboardCloud(); 
    3131 
    32         virtual void writeBillboardCloud(TiXmlDocument *document); 
     32        virtual void writeBillboardCloud(TiXmlDocument *document, bool groupedBillboards); 
     33 
     34        virtual void readBillboardCloud(TiXmlDocument *document, bool groupedBillboards); 
    3335 
    3436}; 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBCBillboardCloudUVMapper.h

    r721 r745  
    4646    void generateTextureAtlasTextureCoords(bool mergeBillboards, bool groupedBillboards = false, unsigned int numberGroups = 1); 
    4747 
    48         void addTextureAtlasTextureCoords(bool mergeBillboards, bool groupedBillboards, unsigned int numGeneratedBillboardClouds, unsigned int iBillboardGroup); 
     48        void addTextureAtlasTextureCoords(bool mergeBillboards, bool groupedBillboards, unsigned int numGeneratedBillboardClouds, unsigned int iBillboardGroup, unsigned int iBillboard); 
    4949 
    5050    void setBillboardCloud(BillboardCloud *billboardCloud); 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBCBillboardClusterData.h

    r721 r745  
    3939        void setEntityCluster(EntityClusterPtr value); 
    4040 
    41         virtual void readBillboardClusterData(TiXmlNode *parentNode); 
     41        virtual void readBillboardClusterData(TiXmlNode *parentNode, int iBillboardGroup); 
    4242 
    43         virtual void writeBillboardClusterData(TiXmlNode *parentNode); 
     43        virtual void writeBillboardClusterData(TiXmlNode *parentNode, int iBillboardGroup); 
    4444 
    4545        virtual void generateBillboardBoundingQuad(); 
     46 
     47        unsigned int getNumUVMapGroups(); 
    4648 
    4749        Ogre::Vector3 getQuadTopLeftCorner(); 
    … …  
    5355        Ogre::Vector3 getQuadBottomRightCorner(); 
    5456 
     57        void setQuadTopLeftCorner(Ogre::Vector3 topLeft); 
     58 
     59        void setQuadTopRightCorner(Ogre::Vector3 topRight); 
     60 
     61        void setQuadBottomLeftCorner(Ogre::Vector3 bottomLeft); 
     62 
     63        void setQuadBottomRightCorner(Ogre::Vector3 bottomRight); 
     64 
    5565        Ogre::Vector3 getAxisX(); 
    5666 
    … …  
    5969        Ogre::Vector3 getAxisZ(); 
    6070 
     71        void setAxisX(Ogre::Vector3 axisX); 
     72 
     73        void setAxisY(Ogre::Vector3 axisY); 
     74 
     75        void setAxisZ(Ogre::Vector3 axisZ); 
     76 
     77        Ogre::Vector2 getBillboardUVMapMin(unsigned int iBillboardGroup); 
     78 
     79        void addBillboardUVMapMin(Ogre::Vector2 min); 
     80 
     81        void removeBillboardUVMapMin(unsigned int iBillboardGroup); 
     82 
     83        Ogre::Vector2 getBillboardUVMapMax(unsigned int iBillboardGroup); 
     84 
     85        void addBillboardUVMapMax(Ogre::Vector2 max); 
     86 
     87        void removeBillboardUVMapMax(unsigned int iBillboardGroup); 
    6188 
    6289 
    … …  
    80107 
    81108        Ogre::Vector3 mNormal; 
     109 
     110        std::vector<Ogre::Vector2> mGroupedBillboardUVMapMinList; 
     111 
     112        std::vector<Ogre::Vector2> mGroupedBillboardUVMapMaxList; 
    82113 
    83114        float mD; 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBCBillboardGroup.h

    r721 r745  
    55 
    66namespace BBC { 
    7  
    8 typedef struct 
    9 { 
    10         unsigned int billboardHandle; 
    11         unsigned int width; 
    12         unsigned int height; 
    13         Ogre::Vector2 min; 
    14         Ogre::Vector2 max;  
    15 } BillboardGroupedInfo; 
    167 
    178// Forward declarations 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/IMG/IMGTexture.h

    r731 r745  
    4444         bool mCalculatedAvgColour; 
    4545 
     46         Ogre::Camera *mCamera; 
     47 
     48         Ogre::PixelFormat mPixelFormat; 
     49 
    4650  public: 
    4751     Texture(); 
    4852 
    4953     virtual ~Texture(); 
     54 
     55         void setRenderTargetListener(Ogre::RenderTargetListener *renderTargetListener); 
     56 
     57         virtual void create(Ogre::String fileName, unsigned int width, unsigned int height, Ogre::PixelFormat pixelFormat, Ogre::Camera *camera); 
    5058 
    5159         Ogre::ColourValue getAvgColour(); 
    … …  
    6169         virtual void save(Ogre::String folderName, Ogre::String filename); 
    6270 
    63          void rotate(Ogre::Real rRotation); 
     71         virtual void update(); 
    6472 
    6573         void setCorners(Ogre::Real left, Ogre::Real top, Ogre::Real right, Ogre::Real bottom); 
    … …  
    8997         void bind(Ogre::String textureName); 
    9098 
     99         void setCamera(Ogre::Camera *camera); 
     100 
     101         void setFormat(Ogre::PixelFormat pixelFormat); 
     102 
    91103}; 
    92104 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/IMG/IMGTextureAtlas.h

    r731 r745  
    2525 
    2626  protected: 
     27         enum CurrentTextureAtlas  
     28         { 
     29             TEXTURE_ATLAS_PING, 
     30         TEXTURE_ATLAS_PONG 
     31     }; 
     32 
    2733     Ogre::String mTextureAtlasName; 
    2834 
    29          Ogre::TexturePtr mTextureAtlas; 
    30  
    31          Ogre::Camera *mCamera; 
     35         Ogre::Texture *mTextureAtlasPong; 
    3236         
    3337         Ogre::SceneNode *mTextureAtlasSceneNode; 
    … …  
    3539     std::vector<TexturePtr> mTextureList; 
    3640 
    37          Ogre::PixelFormat mPixelFormat; 
     41         unsigned int mCurrentTextureAtlas; 
     42 
     43         bool mFirstUpdate; 
    3844 
    3945  public: 
    … …  
    4349    virtual ~TextureAtlas(); 
    4450 
    45         unsigned int getReference(); 
    46  
    47         void setFormat(Ogre::PixelFormat pixelFormat); 
     51        void debug(); 
    4852 
    4953        void create(Ogre::String fileName, unsigned int width, unsigned int height, Ogre::PixelFormat pixelFormat, Ogre::Camera *camera); 
    5054 
    51         void setCamera(Ogre::Camera *camera); 
     55        void update(); 
    5256 
    53         void update(); 
     57        unsigned int getReference(); 
    5458 
    5559        void setTextureAtlasSceneNode(Ogre::SceneNode *textureAtlasSceneNode); 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/LBBC/LBBC.h

    r731 r745  
    1010#include <LBBCClusterViewMode.h> 
    1111#include <LBBCEntityTextureAtlasViewMode.h> 
     12#include <LBBCBillboardCloudTextureViewMode.h> 
    1213#endif 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/LBBC/LBBCBillboardKMeansClusterData.h

    r721 r745  
    1414    virtual ~BillboardKMeansClusterData(); 
    1515 
    16         virtual void readBillboardClusterData(TiXmlNode *parentNode); 
     16        virtual void readBillboardClusterData(TiXmlNode *parentNode, int iBillboardGroup); 
    1717 
    18         virtual void writeBillboardClusterData(TiXmlNode *parentNode); 
     18        virtual void writeBillboardClusterData(TiXmlNode *parentNode, int iBillboardGroup); 
    1919 
    2020        virtual void generateBillboardBoundingQuad(); 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/LBBC/LBBCEntityTextureAtlasViewMode.h

    r731 r745  
    4040                virtual ~EntityTextureAtlasViewMode();           
    4141 
    42                 void setTextureAtlasFolder(Ogre::String textureAtlasFolder); 
    43  
    4442                unsigned int nextPowerOf2(unsigned int nPlanes); 
    4543 
    … …  
    5856                void setTextureAtlasName(Ogre::String textureAtlasName); 
    5957 
     58                void setTextureAtlasFolder(Ogre::String textureAtlasFolder); 
     59 
    6060                void setTextureAtlasSize(unsigned int size); 
    6161}; 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/LBBC/LBBCKMeansClusterSerializer.h

    r721 r745  
    1515    virtual ~KMeansClusterSerializer(); 
    1616 
    17         virtual void writeBillboardCloud(TiXmlDocument *document); 
     17        virtual void writeBillboardCloud(TiXmlDocument *document, bool groupedBillboards); 
    1818 
     19        virtual void readBillboardCloud(TiXmlDocument *document, bool groupedBillboards); 
    1920}; 
    2021 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/LBBC/LBBCKdTreeClusterSerializer.h

    r721 r745  
    1212    virtual ~KdTreeClusterSerializer(); 
    1313 
    14     void writeBillboardCloud(TiXmlDocument *document); 
     14    virtual void writeBillboardCloud(TiXmlDocument *document, bool groupedBillboards); 
     15 
     16        virtual void readBillboardCloud(TiXmlDocument *document, bool groupedBillboards); 
    1517 
    1618}; 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/LBBC/LBBCManager.h

    r731 r745  
    2121    ~LBBCManager(); 
    2222 
    23         void runSampleConfigFile(); 
    24  
    2523        void loadSampleConfigFile(Ogre::String sampleConfigFile); 
    2624 
    2725        SampleConfigFile* getSampleConfigFile(); 
     26 
     27        void initialize(); 
    2828 
    2929        void setSampleConfigFile(SampleConfigFile *sampleConfigFile); 
    … …  
    5757        void saveBillboardCloudXML(); 
    5858 
     59        void saveBillboardCloudMergedXML(); 
     60 
     61        void saveBillboardCloudGroupedXML(); 
     62 
    5963        Leaves* getLeaves(); 
     64 
     65        void loadBillboardCloudXML(); 
     66 
     67        void loadBillboardCloudGroupedXML(); 
     68 
     69        void loadBillboardCloudMergedXML(); 
     70 
    6071 
    6172  protected: 

  • GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/LBBC/LBBCSampleConfigFile.h

    r731 r745  
    5252        Ogre::String getEntityClustersMeshPrefixName(); 
    5353 
    54         Ogre::String getEntityClustersMaterialPrefixName(); 
     54        Ogre::String getEntityClustersMergedMaterialPrefixName(); 
     55 
     56        Ogre::String getEntityClustersSplittedMaterialPrefixName(); 
    5557 
    5658        bool getBillboardCloudMergedBillboards(); 
Note: See TracChangeset for help on using the changeset viewer.