Feature: more demo models & motions; user key input; set position

laqieer · May 7, 2021 · 2c16c9b · 2c16c9b
1 parent 31f87b3
commit 2c16c9b
Show file tree

Hide file tree

Showing 16 changed files with 8,585 additions and 1,285 deletions.
diff --git a/GBA/SSPlayer/SS6Player.cpp b/GBA/SSPlayer/SS6Player.cpp
@@ -3225,10 +3225,10 @@ void Player::setFrame(int frameNo, float dt)
 					else
 					{
 						IdentityMatrix(mat);
-/*
+
 						sprite->_state.x += _state.x;	//スケールの影響を受けるのでrootにプレイヤー座標を加えてはいけない
 						sprite->_state.y += _state.y;
-						sprite->_state.rotationX += _state.rotationX;
+/*						sprite->_state.rotationX += _state.rotationX;
 						sprite->_state.rotationY += _state.rotationY;
 						sprite->_state.rotationZ += _state.rotationZ;
 						sprite->_state.scaleX *= _state.scaleX;

diff --git a/GBA/SSPlayer/SS6PlayerPlatform.cpp b/GBA/SSPlayer/SS6PlayerPlatform.cpp
@@ -422,8 +422,8 @@ namespace ss
         float x = state.mat[12];	/// 表示座標はマトリクスから取得します。
 		float y = state.mat[13];	/// 表示座標はマトリクスから取得します。
 
-        x = _window_w / 2 + x;
-        y = _window_h / 2 + y;
+//        x = _window_w / 2 + x;
+//        y = _window_h / 2 + y;
 
 //        int rotationZ = state.Calc_rotationZ;		/// 回転値
 //        int rotationZ = -state.rotationZ;        /// 回転値