eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-18 19:39:20 +02:00
Code Issues 151 Wiki Activity

Merge branch 'master' into feat/modern-editor

Browse Source
This commit is contained in:
Hirek
2026-10-08 17:44:58 +02:00
parent 28b4e57133 79bd0c8e91
commit 917c8f7285
41 changed files with 479 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
model/Model3d.h
View File

@@ -156,7 +156,10 @@ public: // chwilowo
std::uintptr_t iAnimOwner{ 0 }; // roboczy numer egzemplarza, który ustawił animację
TAnimType b_aAnim{ TAnimType::at_None }; // kody animacji oddzielnie, bo zerowane
std::shared_ptr<float4x4> mAnimMatrix; // macierz do animacji kwaternionowych
TSubModel **smLetter{ nullptr }; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D)
// text display (TP_TEXT) data, filled on first use
std::unordered_map<char32_t, TSubModel *> m_letters; // sub-models of the available characters, by unicode code point
bool m_lettersready { false }; // whether the character lookup was built yet
std::unordered_map<std::string, std::vector<TSubModel *>> m_textlayouts; // sub-models of consecutive characters, for each text shown
TSubModel *Parent{ nullptr }; // nadrzędny, np. do wymnażania macierzy
int iVisible { 1 }; // roboczy stan widoczności
float fVisible { 1.f }; // visibility level
@@ -202,6 +205,8 @@ public:
void SetTranslate(float3 vNewTransVector);
void SetRotateIK1(float3 vNewAngles);
TSubModel * GetFromName( std::string const &search, bool i = true );
// text display (TP_TEXT): returns sub-models of the characters to draw for provided text, in drawing order
std::vector<TSubModel *> const & text_letters( std::string const &Text );
inline float4x4 * GetMatrix() { return fMatrix; };
inline float4x4 const * GetMatrix() const { return fMatrix; };
// returns offset vector from root