asdf
This commit is contained in:
+6
-3
@@ -71,7 +71,7 @@ public:
|
||||
static FaceApp* Get() { return faceIns; }
|
||||
void update_face_vertex_buffer(float* pos, int pointCount);
|
||||
|
||||
virtual bool isInited() override { return inited && faceAppInited; }
|
||||
virtual bool isInited() override { return inited; }
|
||||
virtual void cleanup() override;
|
||||
|
||||
Texture tex_bg = {};
|
||||
@@ -147,7 +147,7 @@ private:
|
||||
void createUniformBuffer();
|
||||
|
||||
|
||||
bool faceAppInited = false;
|
||||
|
||||
|
||||
float myFloatValue = 1.5f;
|
||||
|
||||
@@ -163,6 +163,8 @@ private:
|
||||
|
||||
|
||||
public:
|
||||
void Start();
|
||||
void Stop();
|
||||
void loadMotionThread();
|
||||
std::thread worker_;
|
||||
bool _isLoadMotion = false;
|
||||
@@ -172,7 +174,8 @@ public:
|
||||
bool _animationLoop = true;
|
||||
string preLoadMotionList(string motion_list_str, Callback callback);
|
||||
Motion getMotionByName(string name);
|
||||
vector<Motion>_loadMotions;
|
||||
map<string, Motion>_loadMotionMap;
|
||||
vector<Motion> _curLoadMotionList;
|
||||
vector<Motion>_curMotions;
|
||||
void changeMotionList(vector<string> motions, AnimationFinishedCallback callback, bool loop);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user