Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Line endings and copyright headers...

Browse source 
--HG--
branch : gsoc2014-dfighter
This commit is contained in:
dfighter1985 2014-08-05 13:18:41 +02:00
parent e2a579c03e
commit 99bcb6cf79
5 changed files with 86 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/studio/src/plugins/tile_editor/tile_bank.cpp
View file

@ -1,3 +1,20 @@
// Ryzom Core Studio - Tile Editor plugin
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "tile_bank.h" #include "tile_bank.h"
#include "nel/3d/tile_bank.h" #include "nel/3d/tile_bank.h"

19
code/studio/src/plugins/tile_editor/tile_bank.h
View file

@ -1,3 +1,20 @@
// Ryzom Core Studio - Tile Editor plugin
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef TILE_BANK_H #ifndef TILE_BANK_H
#define TILE_BANK_H #define TILE_BANK_H
@ -54,7 +71,7 @@ public:
void setSurfaceData( int tileSet, unsigned long data ); void setSurfaceData( int tileSet, unsigned long data );
unsigned long getSurfaceData( int tileSet ) const; unsigned long getSurfaceData( int tileSet ) const;
void setTexturePath( const QString &path ); void setTexturePath( const QString &path );
QString getTexturePath() const; QString getTexturePath() const;
void serial( NLMISC::IStream &f ); void serial( NLMISC::IStream &f );

47
code/studio/src/plugins/tile_editor/tile_constants.h
View file

@ -1,24 +1,41 @@
// Ryzom Core Studio - Tile Editor plugin
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef TILE_CONSTANTS_H #ifndef TILE_CONSTANTS_H
#define TILE_CONSTANTS_H #define TILE_CONSTANTS_H
namespace TileConstants namespace TileConstants
{ {
enum TTileChannel enum TTileChannel
{ {
TileDiffuse = 0, TileDiffuse = 0,
TileAdditive = 1, TileAdditive = 1,
TileAlpha = 2, TileAlpha = 2,
TileChannelCount = 3 TileChannelCount = 3
}; };
enum TNodeTileType enum TNodeTileType
{ {
Tile128 = 0, Tile128 = 0,
Tile256 = 1, Tile256 = 1,
TileTransition = 2, TileTransition = 2,
TileDisplacement = 3, TileDisplacement = 3,
TileNodeTypeCount = 4 TileNodeTypeCount = 4
}; };
} }

17
code/studio/src/plugins/tile_editor/tile_images.h
View file

@ -1,3 +1,20 @@
// Ryzom Core Studio - Tile Editor plugin
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef TILE_IMAGES_H #ifndef TILE_IMAGES_H
#define TILE_IMAGES_H #define TILE_IMAGES_H

4
code/studio/src/plugins/tile_editor/tile_model.h
View file

@ -108,10 +108,10 @@ public:
void setVegetation( int tileSet, const QString &vegetation ); void setVegetation( int tileSet, const QString &vegetation );
QString getVegetation( int tileSet ) const; QString getVegetation( int tileSet ) const;
void setOriented( int tileSet, bool b ); void setOriented( int tileSet, bool b );
bool getOriented( int tileSet ) const; bool getOriented( int tileSet ) const;
void setSurfaceData( int tileSet, unsigned long data ); void setSurfaceData( int tileSet, unsigned long data );
unsigned long getSurfaceData( int tileSet ) const; unsigned long getSurfaceData( int tileSet ) const;
void setTexturePath( const QString &path ); void setTexturePath( const QString &path );