eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 05:49:19 +02:00
Code Issues 123 Wiki Activity

Merge branch 'mover_in_c++' of https://github.com/tmj-fstate/maszyna into tmj-fstate-mover_in_c++

Browse Source
This commit is contained in:
milek7
2017-11-03 20:31:20 +01:00
parent d10afe0e16 da11e689ce
commit a3031f105e
35 changed files with 442 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Model3d.h
View File

@@ -184,15 +184,13 @@ public:
};
void InitialRotate(bool doit);
void BinInit(TSubModel *s, float4x4 *m, std::vector<std::string> *t, std::vector<std::string> *n, bool dynamic);
void ReplacableSet(material_handle const *r, int a)
{
static void ReplacableSet(material_handle const *r, int a) {
ReplacableSkinId = r;
iAlpha = a;
};
iAlpha = a; };
void Name_Material( std::string const &Name );
void Name( std::string const &Name );
// Ra: funkcje do budowania terenu z E3D
int Flags() { return iFlags; };
int Flags() const { return iFlags; };
void UnFlagNext() { iFlags &= 0x00FFFFFF; };
void ColorsSet( glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular );
// sets light level (alpha component of illumination color) to specified value
@@ -201,7 +199,7 @@ public:
return fMatrix ? *(fMatrix->TranslationGet()) + v_TransVector : v_TransVector; }
inline float3 Translation2Get() {
return *(fMatrix->TranslationGet()) + Child->Translation1Get(); }
material_handle GetMaterial() {
material_handle GetMaterial() const {
return m_material; }
void ParentMatrix(float4x4 *m);
float MaxY( float4x4 const &m );
@@ -250,8 +248,8 @@ public:
void SaveToBinFile(std::string const &FileName);
int Flags() const { return iFlags; };
void Init();
std::string NameGet() { return m_filename; };
int TerrainCount();
std::string NameGet() const { return m_filename; };
int TerrainCount() const;
TSubModel * TerrainSquare(int n);
void deserialize(std::istream &s, size_t size, bool dynamic);
};