Skip to content

Commit

Permalink
コメント文追加
Browse files Browse the repository at this point in the history
  • Loading branch information
elipmoc committed Mar 2, 2019
1 parent 03aa3ad commit 7662b37
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace elipmocframework {
template<class T=SuperT,class ...Args>
T& New(Args&&... args) {
static_assert(variadic_is_sames_v<T, SuperT, SubsT...>, "生成できない型です");
if (m_nextIndex == m_maxSize)throw std::exception("サイズがいっぱいだよおおお!!");
if (m_nextIndex == m_maxSize)throw std::exception("サイズがいっぱいだよ");
m_nextIndex++;
m_size++;
return *new(m_storagePtr[m_nextIndex - 1].ptr.get()) T(std::forward<Args>(args)...);
Expand All @@ -70,7 +70,7 @@ namespace elipmocframework {
//メモリリリース
void DeleteAt(const size_t at) {
(*this)[at].~SuperT();
if (at >= m_size)throw std::exception("範囲外じゃぼけええええ");
if (at >= m_size)throw std::exception("範囲外");
if (at != m_size - 1)
m_storagePtr[at].Swap(std::move(m_storagePtr[m_size - 1]));
m_size--;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ namespace game {
m_colliQueue.clear();
}

//座標と関数をバインドする
//座標とhitした時に呼ばれる関数をバインドする
template<class F>
CollisionCircle(const siv::Vec2& pos,F func)
:bind_pos(pos),m_hitFunc(func),m_colliData(*(new CollisionData(*this))){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace game {
GameMaster();
~GameMaster();
static GameMaster instance;
//myシーン
//シーン管理クラスの保持
std::unique_ptr<MySceneManager> m_mySceneManager;
//地形データ保持
std::unordered_map<std::string,std::unique_ptr<TerrainData>> m_terrainDataMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
namespace game {



//キー&ボタン入力を管理するシングルトンクラス
class GamePadInput {
GamePadData m_gamePadData{0,1,5};
GamePadInput() {};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ namespace game {
m_mySceneManager->add<ClearScene>(L"Clear");
m_mySceneManager->add<ModeSelectScene>(L"ModeSelect");
m_mySceneManager->add<KeyConfigScene>(L"KeyConfig");
//ファイルデータロード
//ファイルデータロードとセット
try
{
GamePadConfigLoader gpcl;
Expand Down

0 comments on commit 7662b37

Please sign in to comment.