• R/O
  • HTTP
  • SSH
  • HTTPS

提交

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqtwindows誰得cocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Violet Vreath is Shooter Game for Windows XP+(個人制作シューティングゲーム)


Commit MetaInfo

修订版ab1f53b0075192fb3079c2e52c2f957131d2d3e1 (tree)
时间2022-09-30 23:46:06
作者gecchi <gecchi@192....>
Commitergecchi

Log Message

IPlaneModel

更改概述

差异

--- a/GgafDx/GgafDx.vcxproj
+++ b/GgafDx/GgafDx.vcxproj
@@ -254,6 +254,7 @@
254254 <ClInclude Include="include\jp\ggaf\dx\actor\supporter\vecvehiclefaceangassistant.h" />
255255 <ClInclude Include="include\jp\ggaf\dx\actor\supporter\vecvehiclemvangassistant.h" />
256256 <ClInclude Include="include\jp\ggaf\dx\actor\supporter\vecvehiclemvassistant.h" />
257+ <ClInclude Include="include\jp\ggaf\dx\caretaker.h" />
257258 <ClInclude Include="include\jp\ggaf\dx\config.h" />
258259 <ClInclude Include="include\jp\ggaf\dx\effect\BoardEffect.h" />
259260 <ClInclude Include="include\jp\ggaf\dx\effect\boardseteffect.h" />
@@ -309,6 +310,7 @@
309310 <ClInclude Include="include\jp\ggaf\dx\model\ex\WorldBoundModel.h" />
310311 <ClInclude Include="include\jp\ggaf\dx\model\FramedBoardModel.h" />
311312 <ClInclude Include="include\jp\ggaf\dx\model\FramedSpriteModel.h" />
313+ <ClInclude Include="include\jp\ggaf\dx\model\interface\iplanemodel.h" />
312314 <ClInclude Include="include\jp\ggaf\dx\model\massboardmodel.h" />
313315 <ClInclude Include="include\jp\ggaf\dx\model\massmeshmodel.h" />
314316 <ClInclude Include="include\jp\ggaf\dx\model\massmodel.h" />
--- a/GgafDx/GgafDx_VC14.vcxproj
+++ b/GgafDx/GgafDx_VC14.vcxproj
@@ -152,6 +152,7 @@
152152 <ClInclude Include="include\jp\ggaf\dx\model\ex\WorldBoundModel.h" />
153153 <ClInclude Include="include\jp\ggaf\dx\model\FramedBoardModel.h" />
154154 <ClInclude Include="include\jp\ggaf\dx\model\FramedSpriteModel.h" />
155+ <ClInclude Include="include\jp\ggaf\dx\model\interface\IPlaneModel.h" />
155156 <ClInclude Include="include\jp\ggaf\dx\model\MassBoardModel.h" />
156157 <ClInclude Include="include\jp\ggaf\dx\model\MassMeshModel.h" />
157158 <ClInclude Include="include\jp\ggaf\dx\model\MassModel.h" />
--- a/GgafDx/GgafDx_VC14.vcxproj.filters
+++ b/GgafDx/GgafDx_VC14.vcxproj.filters
@@ -561,10 +561,13 @@
561561 <ClInclude Include="include\jp\ggaf\dx\Config.h">
562562 <Filter>ヘッダー ファイル</Filter>
563563 </ClInclude>
564- <ClInclude Include="include\jp\ggaf\dx\God.h">
564+ <ClInclude Include="include\GgafDxCommonHeader.h">
565565 <Filter>ヘッダー ファイル</Filter>
566566 </ClInclude>
567- <ClInclude Include="include\GgafDxCommonHeader.h">
567+ <ClInclude Include="include\jp\ggaf\dx\Caretaker.h">
568+ <Filter>ヘッダー ファイル</Filter>
569+ </ClInclude>
570+ <ClInclude Include="include\jp\ggaf\dx\model\interface\IPlaneModel.h">
568571 <Filter>ヘッダー ファイル</Filter>
569572 </ClInclude>
570573 </ItemGroup>
@@ -1079,7 +1082,7 @@
10791082 <ClCompile Include="src\jp\ggaf\dx\Config.cpp">
10801083 <Filter>ソース ファイル</Filter>
10811084 </ClCompile>
1082- <ClCompile Include="src\jp\ggaf\dx\God.cpp">
1085+ <ClCompile Include="src\jp\ggaf\dx\Caretaker.cpp">
10831086 <Filter>ソース ファイル</Filter>
10841087 </ClCompile>
10851088 </ItemGroup>
--- a/GgafDx/GgafDx_VC16.vcxproj
+++ b/GgafDx/GgafDx_VC16.vcxproj
@@ -309,6 +309,7 @@
309309 <ClInclude Include="include\jp\ggaf\dx\model\ex\WorldBoundModel.h" />
310310 <ClInclude Include="include\jp\ggaf\dx\model\FramedBoardModel.h" />
311311 <ClInclude Include="include\jp\ggaf\dx\model\FramedSpriteModel.h" />
312+ <ClInclude Include="include\jp\ggaf\dx\model\interface\IPlaneModel.h" />
312313 <ClInclude Include="include\jp\ggaf\dx\model\MassBoardModel.h" />
313314 <ClInclude Include="include\jp\ggaf\dx\model\MassMeshModel.h" />
314315 <ClInclude Include="include\jp\ggaf\dx\model\MassModel.h" />
--- a/GgafDx/include/GgafDxCommonHeader.h
+++ b/GgafDx/include/GgafDxCommonHeader.h
@@ -381,6 +381,7 @@ class Model;
381381 class MassModel;
382382 class D3DXMeshModel;
383383 class D3DXAniMeshModel;
384+class IPlaneModel;
384385 class SpriteModel;
385386 class SpriteSetModel;
386387 class MassSpriteModel;
--- a/GgafDx/include/jp/ggaf/dx/model/BoardModel.h
+++ b/GgafDx/include/jp/ggaf/dx/model/BoardModel.h
@@ -2,6 +2,7 @@
22 #define GGAF_DX_BOARDMODEL_H_
33 #include "GgafDxCommonHeader.h"
44 #include "jp/ggaf/dx/model/Model.h"
5+#include "jp/ggaf/dx/model/interface/IPlaneModel.h"
56
67 namespace GgafDx {
78
@@ -11,7 +12,7 @@ namespace GgafDx {
1112 * @since 2009/03/10
1213 * @author Masatoshi Tsuge
1314 */
14-class BoardModel : public Model {
15+class BoardModel : public Model, public IPlaneModel {
1516 friend class ModelManager;
1617 friend class BoardActor;
1718
@@ -32,11 +33,11 @@ public:
3233 UINT _nVertices;
3334
3435 VERTEX* _paVertexBuffer_data;
35-
36- float _model_width_px;
37- float _model_height_px;
38- int _row_texture_split;
39- int _col_texture_split;
36+//
37+// float _model_width_px;
38+// float _model_height_px;
39+// int _row_texture_split;
40+// int _col_texture_split;
4041
4142 public:
4243 /**
--- a/GgafDx/include/jp/ggaf/dx/model/BoardSetModel.h
+++ b/GgafDx/include/jp/ggaf/dx/model/BoardSetModel.h
@@ -2,6 +2,7 @@
22 #define GGAF_DX_BOARDSETMODEL_H_
33 #include "GgafDxCommonHeader.h"
44 #include "jp/ggaf/dx/model/Model.h"
5+#include "jp/ggaf/dx/model/interface/IPlaneModel.h"
56
67 namespace GgafDx {
78
@@ -11,7 +12,7 @@ namespace GgafDx {
1112 * @since 2009/07/21
1213 * @author Masatoshi Tsuge
1314 */
14-class BoardSetModel : public Model {
15+class BoardSetModel : public Model, public IPlaneModel {
1516 friend class ModelManager;
1617 friend class BoardSetActor;
1718
@@ -46,10 +47,10 @@ public:
4647 VERTEX* _paVertexBuffer_data;
4748 WORD* _paIndexBuffer_data;
4849
49- float _model_width_px;
50- float _model_height_px;
51- int _row_texture_split;
52- int _col_texture_split;
50+// float _model_width_px;
51+// float _model_height_px;
52+// int _row_texture_split;
53+// int _col_texture_split;
5354
5455 public:
5556 /**
--- a/GgafDx/include/jp/ggaf/dx/model/FramedBoardModel.h
+++ b/GgafDx/include/jp/ggaf/dx/model/FramedBoardModel.h
@@ -1,7 +1,9 @@
11 #ifndef GGAF_DX_FRAMEDBOARDMODEL_H_
22 #define GGAF_DX_FRAMEDBOARDMODEL_H_
33 #include "GgafDxCommonHeader.h"
4+
45 #include "jp/ggaf/dx/model/Model.h"
6+#include "jp/ggaf/dx/model/interface/IPlaneModel.h"
57
68 namespace GgafDx {
79
@@ -11,7 +13,7 @@ namespace GgafDx {
1113 * @since 2017/08/21
1214 * @author Masatoshi Tsuge
1315 */
14-class FramedBoardModel : public Model {
16+class FramedBoardModel : public Model, public IPlaneModel {
1517 friend class ModelManager;
1618 friend class FramedBoardActor;
1719
@@ -44,10 +46,6 @@ public:
4446 INDEXPARAM _indexParam;
4547 VERTEX* _paVertexBuffer_data;
4648 WORD* _paIndexBuffer_data;
47- float _model_width_px;
48- float _model_height_px;
49- int _row_texture_split;
50- int _col_texture_split;
5149
5250 float _model_frame_width_px;
5351 float _model_frame_height_px;
--- a/GgafDx/include/jp/ggaf/dx/model/FramedSpriteModel.h
+++ b/GgafDx/include/jp/ggaf/dx/model/FramedSpriteModel.h
@@ -1,7 +1,9 @@
11 #ifndef GGAF_DX_FRAMEDSPRITEMODEL_H_
22 #define GGAF_DX_FRAMEDSPRITEMODEL_H_
33 #include "GgafDxCommonHeader.h"
4+
45 #include "jp/ggaf/dx/model/Model.h"
6+#include "jp/ggaf/dx/model/interface/IPlaneModel.h"
57
68 namespace GgafDx {
79
@@ -11,7 +13,7 @@ namespace GgafDx {
1113 * @since 2022/01/25
1214 * @author Masatoshi Tsuge
1315 */
14-class FramedSpriteModel : public Model {
16+class FramedSpriteModel : public Model, public IPlaneModel {
1517 friend class ModelManager;
1618
1719 public:
@@ -47,11 +49,6 @@ public:
4749 /** 基本モデル(1キャラ分)頂点数 */
4850 UINT _nVertices;
4951
50- float _model_width_px;
51- float _model_height_px;
52- int _row_texture_split;
53- int _col_texture_split;
54-
5552 float _model_frame_width_px;
5653 float _model_frame_height_px;
5754 int _row_frame_texture_split;
--- a/GgafDx/include/jp/ggaf/dx/model/MassBoardModel.h
+++ b/GgafDx/include/jp/ggaf/dx/model/MassBoardModel.h
@@ -1,7 +1,9 @@
11 #ifndef GGAF_DX_MASSBOARDMODEL_H_
22 #define GGAF_DX_MASSBOARDMODEL_H_
33 #include "GgafDxCommonHeader.h"
4+
45 #include "jp/ggaf/dx/model/MassModel.h"
6+#include "jp/ggaf/dx/model/interface/IPlaneModel.h"
57
68 namespace GgafDx {
79
@@ -11,7 +13,7 @@ namespace GgafDx {
1113 * @since 2016/02/25
1214 * @author Masatoshi Tsuge
1315 */
14-class MassBoardModel : public MassModel {
16+class MassBoardModel : public MassModel, public IPlaneModel {
1517 friend class ModelManager;
1618 friend class MassBoardActor;
1719
@@ -21,13 +23,8 @@ public:
2123 };
2224 VERTEX_model* _paVtxBuffer_data_model;
2325 WORD* _paIndexBuffer_data;
24-
25- float _model_width_px;
26- float _model_height_px;
2726 float _model_half_width_px;
2827 float _model_half_height_px;
29- int _row_texture_split;
30- int _col_texture_split;
3128
3229 public:
3330 /**
--- a/GgafDx/include/jp/ggaf/dx/model/MassSpriteModel.h
+++ b/GgafDx/include/jp/ggaf/dx/model/MassSpriteModel.h
@@ -1,7 +1,9 @@
11 #ifndef GGAF_DX_MASSSPRITEMODEL_H_
22 #define GGAF_DX_MASSSPRITEMODEL_H_
33 #include "GgafDxCommonHeader.h"
4+
45 #include "jp/ggaf/dx/model/MassModel.h"
6+#include "jp/ggaf/dx/model/interface/IPlaneModel.h"
57
68 namespace GgafDx {
79
@@ -11,7 +13,7 @@ namespace GgafDx {
1113 * @since 2016/02/25
1214 * @author Masatoshi Tsuge
1315 */
14-class MassSpriteModel : public MassModel {
16+class MassSpriteModel : public MassModel, public IPlaneModel {
1517 friend class ModelManager;
1618
1719 public:
@@ -21,12 +23,8 @@ public:
2123 VERTEX_model* _paVtxBuffer_data_model;
2224 WORD* _paIndexBuffer_data;
2325
24- float _model_width_px;
25- float _model_height_px;
2626 float _model_half_width_px;
2727 float _model_half_height_px;
28- int _row_texture_split;
29- int _col_texture_split;
3028
3129 public:
3230 /**
--- a/GgafDx/include/jp/ggaf/dx/model/Model.h
+++ b/GgafDx/include/jp/ggaf/dx/model/Model.h
@@ -16,31 +16,32 @@
1616 //#define Obj_GgafDx_DynaD3DXMeshModel (0x1U) //0b 00000000 00000000 00000000 00000001
1717 #define Obj_GgafDx_D3DXAniMeshModel (0x2U) //0b 00000000 00000000 00000000 00000010
1818 #define Obj_GgafDx_D3DXMeshModel (0x4U) //0b 00000000 00000000 00000000 00000100
19-#define Obj_GgafDx_SpriteModel (0x8U) //0b 00000000 00000000 00000000 00001000
20-#define Obj_GgafDx_SpriteSetModel (0x10U) //0b 00000000 00000000 00000000 00010000
21-#define Obj_GgafDx_BoardModel (0x20U) //0b 00000000 00000000 00000000 00100000
22-#define Obj_GgafDx_BoardSetModel (0x40U) //0b 00000000 00000000 00000000 01000000
23-#define Obj_GgafDx_MeshModel (0x80U) //0b 00000000 00000000 00000000 10000000
24-#define Obj_GgafDx_MeshSetModel (0x100U) //0b 00000000 00000000 00000001 00000000
25-#define Obj_GgafDx_CubeMapMeshModel (0x200U) //0b 00000000 00000000 00000010 00000000
26-#define Obj_GgafDx_CubeMapMeshSetModel (0x400U) //0b 00000000 00000000 00000100 00000000
27-#define Obj_GgafDx_MorphMeshModel (0x800U) //0b 00000000 00000000 00001000 00000000
28-#define Obj_GgafDx_CubeMapMorphMeshModel (0x1000U) //0b 00000000 00000000 00010000 00000000
29-#define Obj_GgafDx_WorldBoundModel (0x2000U) //0b 00000000 00000000 00100000 00000000
30-#define Obj_GgafDx_PointSpriteModel (0x4000U) //0b 00000000 00000000 01000000 00000000
31-#define Obj_GgafDx_MassModel (0x8000U) //0b 00000000 00000000 10000000 00000000
32-#define Obj_GgafDx_MassMeshModel (0x10000U) //0b 00000000 00000001 00000000 00000000
33-#define Obj_GgafDx_MassBoardModel (0x20000U) //0b 00000000 00000010 00000000 00000000
34-#define Obj_GgafDx_MassSpriteModel (0x40000U) //0b 00000000 00000100 00000000 00000000
35-#define Obj_GgafDx_MassMorphMeshModel (0x80000U) //0b 00000000 00001000 00000000 00000000
36-#define Obj_GgafDx_MassPointSpriteModel (0x100000U) //0b 00000000 00010000 00000000 00000000
37-#define Obj_GgafDx_PointSpriteSetModel (0x200000U) //0b 00000000 00100000 00000000 00000000
38-#define Obj_GgafDx_FramedBoardModel (0x400000U) //0b 00000000 01000000 00000000 00000000
39-#define Obj_GgafDx_RegularPolygonSpriteModel (0x800000U) //0b 00000000 10000000 00000000 00000000
40-#define Obj_GgafDx_RegularPolygonBoardModel (0x1000000U) //0b 00000001 00000000 00000000 00000000
41-#define Obj_GgafDx_BoneAniMeshModel (0x2000000U) //0b 00000010 00000000 00000000 00000000
42-#define Obj_GgafDx_SkinAniMeshModel (0x4000000U) //0b 00000100 00000000 00000000 00000000
43-#define Obj_GgafDx_FramedSpriteModel (0x8000000U) //0b 00001000 00000000 00000000 00000000
19+#define Obj_GgafDx_IPlaneModel (0x8U) //0b 00000000 00000000 00000000 00001000
20+#define Obj_GgafDx_SpriteModel (0x10U) //0b 00000000 00000000 00000000 00010000
21+#define Obj_GgafDx_SpriteSetModel (0x20U) //0b 00000000 00000000 00000000 00100000
22+#define Obj_GgafDx_BoardModel (0x40U) //0b 00000000 00000000 00000000 01000000
23+#define Obj_GgafDx_BoardSetModel (0x80U) //0b 00000000 00000000 00000000 10000000
24+#define Obj_GgafDx_MeshModel (0x100U) //0b 00000000 00000000 00000001 00000000
25+#define Obj_GgafDx_MeshSetModel (0x200U) //0b 00000000 00000000 00000010 00000000
26+#define Obj_GgafDx_CubeMapMeshModel (0x400U) //0b 00000000 00000000 00000100 00000000
27+#define Obj_GgafDx_CubeMapMeshSetModel (0x800U) //0b 00000000 00000000 00001000 00000000
28+#define Obj_GgafDx_MorphMeshModel (0x1000U) //0b 00000000 00000000 00010000 00000000
29+#define Obj_GgafDx_CubeMapMorphMeshModel (0x2000U) //0b 00000000 00000000 00100000 00000000
30+#define Obj_GgafDx_WorldBoundModel (0x4000U) //0b 00000000 00000000 01000000 00000000
31+#define Obj_GgafDx_PointSpriteModel (0x8000U) //0b 00000000 00000000 10000000 00000000
32+#define Obj_GgafDx_MassModel (0x10000U) //0b 00000000 00000001 00000000 00000000
33+#define Obj_GgafDx_MassMeshModel (0x20000U) //0b 00000000 00000010 00000000 00000000
34+#define Obj_GgafDx_MassBoardModel (0x40000U) //0b 00000000 00000100 00000000 00000000
35+#define Obj_GgafDx_MassSpriteModel (0x80000U) //0b 00000000 00001000 00000000 00000000
36+#define Obj_GgafDx_MassMorphMeshModel (0x100000U) //0b 00000000 00010000 00000000 00000000
37+#define Obj_GgafDx_MassPointSpriteModel (0x200000U) //0b 00000000 00100000 00000000 00000000
38+#define Obj_GgafDx_PointSpriteSetModel (0x400000U) //0b 00000000 01000000 00000000 00000000
39+#define Obj_GgafDx_FramedBoardModel (0x800000U) //0b 00000000 10000000 00000000 00000000
40+#define Obj_GgafDx_RegularPolygonSpriteModel (0x1000000U) //0b 00000001 00000000 00000000 00000000
41+#define Obj_GgafDx_RegularPolygonBoardModel (0x2000000U) //0b 00000010 00000000 00000000 00000000
42+#define Obj_GgafDx_BoneAniMeshModel (0x4000000U) //0b 00000100 00000000 00000000 00000000
43+#define Obj_GgafDx_SkinAniMeshModel (0x8000000U) //0b 00001000 00000000 00000000 00000000
44+#define Obj_GgafDx_FramedSpriteModel (0x10000000U) //0b 00010000 00000000 00000000 00000000
4445
4546 namespace GgafDx {
4647
--- a/GgafDx/include/jp/ggaf/dx/model/RegularPolygonBoardModel.h
+++ b/GgafDx/include/jp/ggaf/dx/model/RegularPolygonBoardModel.h
@@ -2,6 +2,7 @@
22 #define GGAF_DX_REGULARPOLYGONBOARDMODEL_H_
33 #include "GgafDxCommonHeader.h"
44 #include "jp/ggaf/dx/model/Model.h"
5+#include "jp/ggaf/dx/model/interface/IPlaneModel.h"
56
67 namespace GgafDx {
78
@@ -11,7 +12,7 @@ namespace GgafDx {
1112 * @since 2009/03/10
1213 * @author Masatoshi Tsuge
1314 */
14-class RegularPolygonBoardModel : public Model {
15+class RegularPolygonBoardModel : public Model, public IPlaneModel {
1516 friend class ModelManager;
1617 friend class RegularPolygonBoardActor;
1718
@@ -29,10 +30,6 @@ public:
2930 /** 1頂点のサイズ */
3031 UINT _size_vertex_unit;
3132 VERTEX* _paVertexBuffer_data;
32- float _model_width_px;
33- float _model_height_px;
34- int _row_texture_split;
35- int _col_texture_split;
3633
3734 /** FAN描画順方向 1:時計回り/1以外:反時計回り */
3835 int _drawing_order;
--- a/GgafDx/include/jp/ggaf/dx/model/RegularPolygonSpriteModel.h
+++ b/GgafDx/include/jp/ggaf/dx/model/RegularPolygonSpriteModel.h
@@ -2,6 +2,7 @@
22 #define GGAF_DX_REGULARPOLYGONSPRITEMODEL_H_
33 #include "GgafDxCommonHeader.h"
44 #include "jp/ggaf/dx/model/Model.h"
5+#include "jp/ggaf/dx/model/interface/IPlaneModel.h"
56
67 namespace GgafDx {
78
@@ -11,7 +12,7 @@ namespace GgafDx {
1112 * @since 2018/10/18
1213 * @author Masatoshi Tsuge
1314 */
14-class RegularPolygonSpriteModel : public Model {
15+class RegularPolygonSpriteModel : public Model, public IPlaneModel {
1516 friend class ModelManager;
1617
1718 public:
@@ -30,10 +31,6 @@ public:
3031 /** 1頂点のサイズ */
3132 UINT _size_vertex_unit;
3233 VERTEX* _paVertexBuffer_data;
33- float _model_width_px;
34- float _model_height_px;
35- int _row_texture_split;
36- int _col_texture_split;
3734 /** FAN描画順方向 1:時計回り/1以外:反時計回り */
3835 int _drawing_order;
3936 /** 正何角形か */
--- a/GgafDx/include/jp/ggaf/dx/model/SpriteModel.h
+++ b/GgafDx/include/jp/ggaf/dx/model/SpriteModel.h
@@ -2,6 +2,7 @@
22 #define GGAF_DX_SPRITEMODEL_H_
33 #include "GgafDxCommonHeader.h"
44 #include "jp/ggaf/dx/model/Model.h"
5+#include "jp/ggaf/dx/model/interface/IPlaneModel.h"
56
67 namespace GgafDx {
78
@@ -11,7 +12,7 @@ namespace GgafDx {
1112 * @since 2008/02/22
1213 * @author Masatoshi Tsuge
1314 */
14-class SpriteModel : public Model {
15+class SpriteModel : public Model, public IPlaneModel {
1516 friend class ModelManager;
1617
1718 public:
@@ -34,11 +35,6 @@ public:
3435 /** 基本モデル(1キャラ分)頂点数 */
3536 UINT _nVertices;
3637
37- float _model_width_px;
38- float _model_height_px;
39- int _row_texture_split;
40- int _col_texture_split;
41-
4238 public:
4339 /**
4440 * コンストラクタ<BR>
--- a/GgafDx/include/jp/ggaf/dx/model/SpriteSetModel.h
+++ b/GgafDx/include/jp/ggaf/dx/model/SpriteSetModel.h
@@ -1,7 +1,9 @@
11 #ifndef GGAF_DX_SPRITESETMODEL_H_
22 #define GGAF_DX_SPRITESETMODEL_H_
33 #include "GgafDxCommonHeader.h"
4+
45 #include "jp/ggaf/dx/model/Model.h"
6+#include "jp/ggaf/dx/model/interface/IPlaneModel.h"
57
68 namespace GgafDx {
79
@@ -11,7 +13,7 @@ namespace GgafDx {
1113 * @since 2009/07/14
1214 * @author Masatoshi Tsuge
1315 */
14-class SpriteSetModel : public Model {
16+class SpriteSetModel : public Model, public IPlaneModel {
1517 friend class ModelManager;
1618
1719 public:
@@ -44,11 +46,6 @@ public:
4446 UINT _size_vertex_unit;
4547 INDEXPARAM* _paIndexParam;
4648
47- float _model_width_px;
48- float _model_height_px;
49- int _row_texture_split;
50- int _col_texture_split;
51-
5249 public:
5350 /**
5451 * コンストラクタ<BR>
--- /dev/null
+++ b/GgafDx/include/jp/ggaf/dx/model/interface/IPlaneModel.h
@@ -0,0 +1,43 @@
1+#ifndef GGAF_DX_IPLANEMODEL_H_
2+#define GGAF_DX_IPLANEMODEL_H_
3+#include "GgafDxCommonHeader.h"
4+
5+namespace GgafDx {
6+
7+/**
8+ * PlaneActor用モデルクラス.
9+ * @version 1.00
10+ * @since 2009/03/10
11+ * @author Masatoshi Tsuge
12+ */
13+class IPlaneModel {
14+
15+public:
16+ float _model_width_px;
17+ float _model_height_px;
18+ int _row_texture_split;
19+ int _col_texture_split;
20+
21+public:
22+ /**
23+ * コンストラクタ<BR>
24+ */
25+ IPlaneModel() {
26+ _model_width_px = 32.0f;
27+ _model_height_px = 32.0f;
28+ _row_texture_split = 1;
29+ _col_texture_split = 1;
30+ }
31+
32+
33+ /**
34+ * デストラクタ<BR>
35+ * deleteするのはPlaneModelManagerである<BR>
36+ */
37+ virtual ~IPlaneModel() {
38+ }
39+
40+};
41+
42+}
43+#endif /*GGAF_DX_IPLANEMODEL_H_*/
--- a/GgafDx/src/jp/ggaf/dx/model/BoardModel.cpp
+++ b/GgafDx/src/jp/ggaf/dx/model/BoardModel.cpp
@@ -17,13 +17,9 @@ using namespace GgafDx;
1717 DWORD BoardModel::FVF = (D3DFVF_XYZ | D3DFVF_TEX1);
1818
1919 BoardModel::BoardModel(const char* prm_model_id) :
20- Model(prm_model_id) {
20+ Model(prm_model_id), IPlaneModel() {
2121 _TRACE3_("_model_id="<<_model_id);
2222 _obj_model |= Obj_GgafDx_BoardModel;
23- _model_width_px = 32.0f;
24- _model_height_px = 32.0f;
25- _row_texture_split = 1;
26- _col_texture_split = 1;
2723 _paVertexBuffer = nullptr;
2824 _paVertexBuffer_data = nullptr;
2925 _size_vertices = 0;
--- a/GgafDx/src/jp/ggaf/dx/model/BoardSetModel.cpp
+++ b/GgafDx/src/jp/ggaf/dx/model/BoardSetModel.cpp
@@ -16,13 +16,13 @@
1616 using namespace GgafDx;
1717
1818 DWORD BoardSetModel::FVF = (D3DFVF_XYZ | D3DFVF_PSIZE | D3DFVF_TEX1);
19-BoardSetModel::BoardSetModel(const char* prm_model_id) : Model(prm_model_id) {
19+BoardSetModel::BoardSetModel(const char* prm_model_id) : Model(prm_model_id), IPlaneModel() {
2020 _TRACE3_("_model_id="<<_model_id);
2121 _obj_model |= Obj_GgafDx_BoardSetModel;
22- _model_width_px = 32.0f;
23- _model_height_px = 32.0f;
24- _row_texture_split = 1;
25- _col_texture_split = 1;
22+// _model_width_px = 32.0f;
23+// _model_height_px = 32.0f;
24+// _row_texture_split = 1;
25+// _col_texture_split = 1;
2626 _paVertexBuffer = nullptr;
2727 _paIndexBuffer = nullptr;
2828 _paVertexBuffer_data = nullptr;
--- a/GgafDx/src/jp/ggaf/dx/model/FramedBoardModel.cpp
+++ b/GgafDx/src/jp/ggaf/dx/model/FramedBoardModel.cpp
@@ -14,16 +14,11 @@
1414 using namespace GgafDx;
1515
1616 DWORD FramedBoardModel::FVF = (D3DFVF_XYZ | D3DFVF_PSIZE | D3DFVF_TEX1);
17-FramedBoardModel::FramedBoardModel(const char* prm_model_id) : Model(prm_model_id) {
17+FramedBoardModel::FramedBoardModel(const char* prm_model_id) : Model(prm_model_id), IPlaneModel() {
1818 _TRACE3_("_model_id="<<_model_id);
1919 _obj_model |= Obj_GgafDx_FramedBoardModel;
2020 _paVertexBuffer_data = nullptr;
2121 _paIndexBuffer_data = nullptr;
22-
23- _model_width_px = 32.0f;
24- _model_height_px = 32.0f;
25- _row_texture_split = 1;
26- _col_texture_split = 1;
2722 _model_frame_width_px = 32.0f;
2823 _model_frame_height_px = 32.0f;
2924 _row_frame_texture_split = 1;
--- a/GgafDx/src/jp/ggaf/dx/model/FramedSpriteModel.cpp
+++ b/GgafDx/src/jp/ggaf/dx/model/FramedSpriteModel.cpp
@@ -17,13 +17,9 @@ using namespace GgafDx;
1717
1818 DWORD FramedSpriteModel::FVF = (D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_PSIZE | D3DFVF_DIFFUSE | D3DFVF_TEX1);
1919
20-FramedSpriteModel::FramedSpriteModel(const char* prm_model_id) : Model(prm_model_id) {
20+FramedSpriteModel::FramedSpriteModel(const char* prm_model_id) : Model(prm_model_id), IPlaneModel() {
2121 _TRACE3_("_model_id="<<_model_id);
2222 _obj_model |= Obj_GgafDx_FramedSpriteModel;
23- _model_width_px = 32.0f;
24- _model_height_px = 32.0f;
25- _row_texture_split = 1;
26- _col_texture_split = 1;
2723 _model_frame_width_px = 32.0f;
2824 _model_frame_height_px = 32.0f;
2925 _row_frame_texture_split = 1;
--- a/GgafDx/src/jp/ggaf/dx/model/MassBoardModel.cpp
+++ b/GgafDx/src/jp/ggaf/dx/model/MassBoardModel.cpp
@@ -12,18 +12,13 @@
1212
1313 using namespace GgafDx;
1414
15-MassBoardModel::MassBoardModel(const char* prm_model_id) : MassModel(prm_model_id) {
15+MassBoardModel::MassBoardModel(const char* prm_model_id) : MassModel(prm_model_id), IPlaneModel() {
1616 _TRACE3_("_model_id="<<_model_id);
1717 _obj_model |= Obj_GgafDx_MassBoardModel;
1818 _paVtxBuffer_data_model = nullptr;
1919 _paIndexBuffer_data = nullptr;
20-
21- _model_width_px = 32.0f;
22- _model_height_px = 32.0f;
2320 _model_half_width_px = _model_width_px/2;
2421 _model_half_height_px = _model_height_px/2;
25- _row_texture_split = 1;
26- _col_texture_split = 1;
2722 _papTextureConnection = nullptr;
2823 _max_draw_set_num = GGAFDXMASS_MAX_INSTANCE_NUM;
2924 registerCallback_VertexModelInfo(MassBoardModel::createVertexModel); //頂点レイアウト情報作成コールバック関数
--- a/GgafDx/src/jp/ggaf/dx/model/MassSpriteModel.cpp
+++ b/GgafDx/src/jp/ggaf/dx/model/MassSpriteModel.cpp
@@ -13,17 +13,13 @@
1313
1414 using namespace GgafDx;
1515
16-MassSpriteModel::MassSpriteModel(const char* prm_model_id) : MassModel(prm_model_id) {
16+MassSpriteModel::MassSpriteModel(const char* prm_model_id) : MassModel(prm_model_id), IPlaneModel() {
1717 _TRACE3_("_model_id="<<_model_id);
1818 _obj_model |= Obj_GgafDx_MassSpriteModel;
1919 _paVtxBuffer_data_model = nullptr;
2020 _paIndexBuffer_data = nullptr;
21- _model_width_px = 32.0f;
22- _model_height_px = 32.0f;
2321 _model_half_width_px = _model_width_px/2;
2422 _model_half_height_px = _model_height_px/2;
25- _row_texture_split = 1;
26- _col_texture_split = 1;
2723 _papTextureConnection = nullptr;
2824 _max_draw_set_num = GGAFDXMASS_MAX_INSTANCE_NUM;
2925 registerCallback_VertexModelInfo(MassSpriteModel::createVertexModel); //頂点レイアウト情報作成コールバック関数
--- a/GgafDx/src/jp/ggaf/dx/model/RegularPolygonBoardModel.cpp
+++ b/GgafDx/src/jp/ggaf/dx/model/RegularPolygonBoardModel.cpp
@@ -18,14 +18,10 @@ using namespace GgafDx;
1818 DWORD RegularPolygonBoardModel::FVF = (D3DFVF_XYZ | D3DFVF_TEX1);
1919
2020 RegularPolygonBoardModel::RegularPolygonBoardModel(const char* prm_model_id) :
21- Model(prm_model_id) {
21+ Model(prm_model_id), IPlaneModel() {
2222 _TRACE3_("_model_id="<<_model_id);
2323 _obj_model |= Obj_GgafDx_RegularPolygonBoardModel;
2424 _paVertexBuffer_data = nullptr;
25- _model_width_px = 32.0f;
26- _model_height_px = 32.0f;
27- _row_texture_split = 1;
28- _col_texture_split = 1;
2925 _paVertexBuffer = nullptr;
3026 _size_vertices = 0;
3127 _size_vertex_unit = 0;
--- a/GgafDx/src/jp/ggaf/dx/model/RegularPolygonSpriteModel.cpp
+++ b/GgafDx/src/jp/ggaf/dx/model/RegularPolygonSpriteModel.cpp
@@ -17,13 +17,9 @@ using namespace GgafDx;
1717
1818 DWORD RegularPolygonSpriteModel::FVF = (D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_TEX1);
1919
20-RegularPolygonSpriteModel::RegularPolygonSpriteModel(const char* prm_model_id) : Model(prm_model_id) {
20+RegularPolygonSpriteModel::RegularPolygonSpriteModel(const char* prm_model_id) : Model(prm_model_id), IPlaneModel() {
2121 _TRACE3_("_model_id="<<_model_id);
2222 _obj_model |= Obj_GgafDx_RegularPolygonSpriteModel;
23- _model_width_px = 32.0f;
24- _model_height_px = 32.0f;
25- _row_texture_split = 1;
26- _col_texture_split = 1;
2723 _paVertexBuffer = nullptr;
2824 _paVertexBuffer_data = nullptr;
2925 _size_vertices = 0;
--- a/GgafDx/src/jp/ggaf/dx/model/SpriteModel.cpp
+++ b/GgafDx/src/jp/ggaf/dx/model/SpriteModel.cpp
@@ -17,13 +17,9 @@ using namespace GgafDx;
1717
1818 DWORD SpriteModel::FVF = (D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_TEX1);
1919
20-SpriteModel::SpriteModel(const char* prm_model_id) : Model(prm_model_id) {
20+SpriteModel::SpriteModel(const char* prm_model_id) : Model(prm_model_id), IPlaneModel() {
2121 _TRACE3_("_model_id="<<_model_id);
2222 _obj_model |= Obj_GgafDx_SpriteModel;
23- _model_width_px = 32.0f;
24- _model_height_px = 32.0f;
25- _row_texture_split = 1;
26- _col_texture_split = 1;
2723 _paVertexBuffer = nullptr;
2824 _paVertexBuffer_data = nullptr;
2925 _size_vertices = 0;
--- a/GgafDx/src/jp/ggaf/dx/model/SpriteSetModel.cpp
+++ b/GgafDx/src/jp/ggaf/dx/model/SpriteSetModel.cpp
@@ -17,16 +17,11 @@
1717 using namespace GgafDx;
1818
1919 DWORD SpriteSetModel::FVF = (D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_PSIZE | D3DFVF_TEX1);
20-SpriteSetModel::SpriteSetModel(const char* prm_model_id) : Model(prm_model_id) {
20+SpriteSetModel::SpriteSetModel(const char* prm_model_id) : Model(prm_model_id), IPlaneModel() {
2121 _TRACE3_("_model_id="<<_model_id);
2222 _obj_model |= Obj_GgafDx_SpriteSetModel;
2323 _paVertexBuffer_data = nullptr;
2424 _paIndexBuffer_data = nullptr;
25-
26- _model_width_px = 32.0f;
27- _model_height_px = 32.0f;
28- _row_texture_split = 1;
29- _col_texture_split = 1;
3025 _paVertexBuffer = nullptr;
3126 _paIndexBuffer = nullptr;
3227 _size_vertices = 0;
--- a/GgafLib/include/jp/ggaf/lib/util/CollisionChecker2D_b.h
+++ b/GgafLib/include/jp/ggaf/lib/util/CollisionChecker2D_b.h
@@ -55,6 +55,8 @@ public:
5555 void setColliAABox(int prm_index,
5656 coord x1, coord y1,
5757 coord x2, coord y2 );
58+ void setColliAABox(int prm_index,
59+ double per);
5860
5961 virtual ~CollisionChecker2D_b();
6062 };
--- a/GgafLib/src/jp/ggaf/lib/util/CollisionChecker2D_b.cpp
+++ b/GgafLib/src/jp/ggaf/lib/util/CollisionChecker2D_b.cpp
@@ -4,6 +4,10 @@
44 #include "jp/ggaf/core/util/LinearQuadtree.h"
55 #include "jp/ggaf/dx/exception/CriticalException.h"
66 #include "jp/ggaf/dx/util/CollisionArea.h"
7+#include "jp/ggaf/dx/actor/BoardActor.h"
8+#include "jp/ggaf/dx/actor/BoardSetActor.h"
9+#include "jp/ggaf/dx/model/BoardModel.h"
10+#include "jp/ggaf/dx/model/BoardSetModel.h"
711 #include "jp/ggaf/lib/DefaultCaretaker.h"
812 #include "jp/ggaf/lib/scene/DefaultSpacetime.h"
913 #include "jp/ggaf/lib/util/CollisionChecker.h"
@@ -49,8 +53,6 @@ bool CollisionChecker2D_b::isHit(const GgafDx::Checker* const prm_pOppChecker) {
4953 GgafDx::CollisionArea* const pOppCollisionArea = prm_pOppChecker->_pCollisionArea; //相手の当たり判定領域
5054 const GgafDx::GeometricActor* const pActor = _pActor; //相手のアクター
5155 const GgafDx::GeometricActor* const pOppActor = prm_pOppChecker->_pActor; //相手のアクター
52- const int colli_part_num = pCollisionArea->_colli_part_num;
53- const int opp_colli_part_num = pOppCollisionArea->_colli_part_num; //相手の当たり判定要素数
5456
5557 #ifdef MY_DEBUG
5658 CollisionChecker::_num_check++;
@@ -95,7 +97,41 @@ void CollisionChecker2D_b::setColliAABox(int prm_index,
9597 // _is_enable = true;
9698 }
9799
100+void CollisionChecker2D_b::setColliAABox(int prm_index, double per) {
98101
102+// Obj_GgafDx_BoardSetActor
103+ pixcoord w, h;
104+ Align a;
105+ Valign va;
106+
107+// GgafDx::Model* pModel = _pActor->getModel();
108+// if (pModel->instanceOf(Obj_GgafDx_IPlaneModel)) {
109+// GgafDx::IPlaneModel* pPlaneModel = (GgafDx::IPlaneModel*)pModel;
110+// w = pPlaneModel->_model_width_px;
111+// h = pPlaneModel->_model_height_px;
112+//// a = pActor->_align;
113+//// va = pActor->_valign;
114+// }
115+
116+
117+
118+ if (_pActor->instanceOf(Obj_GgafDx_BoardActor)) {
119+ GgafDx::BoardActor* pActor = (GgafDx::BoardActor*)_pActor;
120+ w = (pixcoord)pActor->getModelWidth();
121+ h = (pixcoord)pActor->getModelHeight();
122+ a = pActor->_align;
123+ va = pActor->_valign;
124+// GgafDx::BoardModel* pModel= (GgafDx::BoardModel*)pActor->getModel();
125+ } else if (_pActor->instanceOf(Obj_GgafDx_BoardSetActor)) {
126+ GgafDx::BoardSetActor* pActor = (GgafDx::BoardSetActor*)_pActor;
127+ w = (pixcoord)pActor->getModelWidth();
128+ h = (pixcoord)pActor->getModelHeight();
129+// GgafDx::BoardModel* pModel= (GgafDx::BoardModel*)pActor->getModel();
130+ a = pActor->_align;
131+ va = pActor->_valign;
132+ }
133+
134+}
99135
100136 CollisionChecker2D_b::~CollisionChecker2D_b() {
101137 delete _pElem;
--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/menu/confirm/MenuBoardSelect.cpp
+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/menu/confirm/MenuBoardSelect.cpp
@@ -2,7 +2,7 @@
22 #include "CursorSelectMenu.h"
33
44 #include "jp/gecchi/VioletVreath/actor/label/LabelGecchi16Font.h"
5-#include "jp/gecchi/VioletVreath/actor/menu/MenuItemHitarea.h"
5+//#include "jp/gecchi/VioletVreath/actor/menu/MenuItemHitarea.h"
66 #include "jp/ggaf/core/actor/SceneMediator.h"
77 #include "jp/ggaf/lib/actor/DefaultGeometricActor.h"
88 #include "jp/gecchi/VioletVreath/Caretaker.h"
@@ -28,8 +28,8 @@ MenuBoardSelect::MenuBoardSelect(const char* prm_name) :
2828 pSelectDisp->update(default_name.c_str(), ALIGN_CENTER, VALIGN_MIDDLE);
2929 addItem(pSelectDisp);
3030
31- MenuItemHitarea* pHitArea = NEW MenuItemHitarea(pSelectDisp);
32- pSelectDisp->appendGroupChild(KIND_MENU_ITEM, pHitArea);
31+// MenuItemHitarea* pHitArea = NEW MenuItemHitarea(pSelectDisp);
32+// pSelectDisp->appendGroupChild(KIND_MENU_ITEM, pHitArea);
3333 }
3434
3535 CursorSelectMenu* pCursor = NEW CursorSelectMenu("CursorSelectMenu");