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

openvr WIP

Browse Source
This commit is contained in:
milek7
2020-09-29 22:27:13 +02:00
parent ffa01f8e6d
commit 936effa9db
21 changed files with 693 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Model3d.cpp
View File

@@ -61,7 +61,7 @@ void TSubModel::Name_Material(std::string const &Name)
// ile nie jest wczytany z E3D
if (iFlags & 0x0200)
{ // tylko jeżeli submodel zosta utworzony przez new
m_materialname = Name;
m_materialname = Name;
}
};
@@ -1244,6 +1244,16 @@ void TSubModel::ParentMatrix( float4x4 *m ) const {
*/
};
void TSubModel::ReplaceMatrix(const glm::mat4 &mat)
{
*fMatrix = float4x4(glm::value_ptr(mat));
}
void TSubModel::ReplaceMaterial(const std::string &name)
{
m_material = GfxRenderer.Fetch_Material(name);
}
// obliczenie maksymalnej wysokości, na początek ślizgu w pantografie
float TSubModel::MaxY( float4x4 const &m ) {
// tylko dla trójkątów liczymy
@@ -1926,6 +1936,32 @@ void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic)
WriteLog( "Finished loading 3d model data from \"" + FileName + "\"", logtype::model );
};
TSubModel* TModel3d::AppendChildFromGeometry(const std::string &name, const std::string &parent, const gfx::vertex_array &data)
{
iFlags |= 0x0200;
TSubModel *sm = new TSubModel();
sm->Parent = AddToNamed(parent.c_str(), sm);
sm->iNumVerts = data.size();
sm->eType = GL_TRIANGLES;
sm->pName = name;
sm->m_material = GfxRenderer.Fetch_Material("colored");
sm->fMatrix = new float4x4();
sm->fMatrix->Identity();
sm->iFlags |= 0x10;
sm->iFlags |= 0x8000;
sm->WillBeAnimated();
if (data.empty())
sm->iFlags &= ~0x3F;
sm->Vertices = data;
iNumVerts += data.size();
if (!Root)
Root = sm;
return sm;
}
void TModel3d::LoadFromTextFile(std::string const &FileName, bool dynamic)
{ // wczytanie submodelu z pliku tekstowego
WriteLog( "Loading text format 3d model data from \"" + FileName + "\"...", logtype::model );