salmon-engine-projects/crystal-of-rhylil
14
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

"On tap" does not work properly

Browse Source
This commit is contained in:
samat.agishev committed 2018-02-02 20:00:17 +05:00
1 parent d80637e343
commit cfd1a0a062
5 files changed
+130 -114
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

jni/match3/match3field.cpp
+62 -27
View File
@@ -13,14 +13,16 @@ void TChipTemplateParams::Serialize(boost::property_tree::ptree& propertyTree)
std::string selectedNormTexName = propertyTree.get<std::string>("SelectedNormTexName");
std::string finishingTexName = propertyTree.get<std::string>("FinishingTexName");
//SelectedRenderParams.ShaderName = selectedShaderName;
//SelectedRenderParams.TexName = selectedTexName;
//SelectedRenderParams.NormTexName = selectedNormTexName;
SelectedRenderParams.ShaderName = selectedShaderName;
SelectedRenderParams.SamplerMap[SE::CONST_STRING_TEXTURE_UNIFORM] = selectedTexName;
SelectedRenderParams.SamplerMap[SE::CONST_STRING_NORMALMAP_UNIFORM] = selectedNormTexName;
SelectedRenderParams.transparencyFlag = SE::TRenderParams::opaque;
//SelectedRenderParams.Transparency = 1.f;
//
//FinishingRenderParams.ShaderName = "";
//FinishingRenderParams.TexName = finishingTexName;
//FinishingRenderParams.NormTexName = "";
FinishingRenderParams.ShaderName = "";
FinishingRenderParams.SamplerMap[SE::CONST_STRING_TEXTURE_UNIFORM] = finishingTexName;
FinishingRenderParams.SamplerMap[SE::CONST_STRING_NORMALMAP_UNIFORM] = "";
SelectedRenderParams.transparencyFlag = SE::TRenderParams::opaque;
//FinishingRenderParams.Transparency = 1.f;
std::string selectedAnimFileName = propertyTree.get<std::string>("SelectedAnimFileName");
@@ -141,23 +143,29 @@ void TMatch3Logic::FillRandomChipMatrix(std::vector<SE::TRenderPairList::iterato
if (i == 0 && j == 6)
{
//AddChipToUp(i, chipType, GetExpectedLeftBottomPos(i, j), TChip::CS_LOCKED);
AddChipToUp(i, chipType, GetExpectedLeftBottomPos(i, j), TChip::CS_STANDBY);
InnerAddChipToUp(i, chipType, GetExpectedLeftBottomPos(i, j), TChip::CS_STANDBY);
}
else
{
AddChipToUp(i, chipType, GetExpectedLeftBottomPos(i, j), TChip::CS_STANDBY);
InnerAddChipToUp(i, chipType, GetExpectedLeftBottomPos(i, j), TChip::CS_STANDBY);
}
}
}
std::vector<Eigen::Vector2i> chipList;
std::vector<Eigen::Vector2i> chipList = GetAvailableMatchingChips();
while (chipList.size() != 0)
{
UnmatchChips(chipList);
do {
chipList = GetAvailableMatchingChips();
UnmatchChips(chipList);
} while (!chipList.empty());
for (size_t i = 0; i < ChipMatrix.size(); i++) {
for (size_t j = 0; j < ChipMatrix[i].size(); j++) {
ReplaceAnimation(Eigen::Vector2i(i, j));
}
}
}
@@ -384,7 +392,26 @@ void TMatch3Logic::MoveVertexListShiftBack(SE::TRenderPairList::iterator renderP
}
}
void TMatch3Logic::AddChipToUp(size_t colNum, int chipType, Eigen::Vector2f spawnPos, TChip::TChipState chipState)
void TMatch3Logic::MoveVertexListShiftBackWithoutAnimation(SE::TRenderPairList::iterator renderPairItr, size_t moveFrom)
{
for (size_t i = 0; i < ChipMatrix.size(); i++)
{
for (size_t j = 0; j < ChipMatrix[i].size(); j++)
{
if (ChipMatrix[i][j].RenderPair == renderPairItr)
{
if (ChipMatrix[i][j].VertexListShift > moveFrom)
{
ChipMatrix[i][j].VertexListShift -= 6;
//ReplaceAnimation(Eigen::Vector2i(i, j));
}
}
}
}
}
void TMatch3Logic::InnerAddChipToUp(size_t colNum, int chipType, Eigen::Vector2f spawnPos, TChip::TChipState chipState)
{
size_t yPos = ChipMatrix[colNum].size();
@@ -416,11 +443,19 @@ void TMatch3Logic::AddChipToUp(size_t colNum, int chipType, Eigen::Vector2f spaw
ChipMatrix[colNum].push_back(TChip(chipType, RenderPairIteratorVector[renderPairIndex], vertexListShift, chipState));
ReplaceAnimation(Eigen::Vector2i(colNum, yPos));
triangleList.NeedRefreshBuffer = true;
//triangleList.NeedRefreshBuffer = true;
}
void TMatch3Logic::AddChipToUp(size_t colNum, int chipType, Eigen::Vector2f spawnPos, TChip::TChipState chipState)
{
InnerAddChipToUp(colNum, chipType, spawnPos, chipState);
size_t yPos = ChipMatrix[colNum].size() - 1; //?
ReplaceAnimation(Eigen::Vector2i(colNum, yPos));
}
void TMatch3Logic::InsertEmptyChip(size_t colNum, size_t rowNum, int chipType)
{
@@ -692,7 +727,7 @@ void TMatch3Logic::DestroyChip(Eigen::Vector2i p)
ChipMatrix[p[0]][p[1]].RenderPair->second.Data.Vec2CoordArr[SE::CONST_STRING_TEXCOORD_ATTRIB].begin() + ChipMatrix[p[0]][p[1]].VertexListShift,
ChipMatrix[p[0]][p[1]].RenderPair->second.Data.Vec2CoordArr[SE::CONST_STRING_TEXCOORD_ATTRIB].begin() + ChipMatrix[p[0]][p[1]].VertexListShift + 6);
MoveVertexListShiftBack(ChipMatrix[p[0]][p[1]].RenderPair, ChipMatrix[p[0]][p[1]].VertexListShift);
MoveVertexListShiftBackWithoutAnimation(ChipMatrix[p[0]][p[1]].RenderPair, ChipMatrix[p[0]][p[1]].VertexListShift);
ChipMatrix[p[0]].erase(ChipMatrix[p[0]].begin() + p[1]);
/*
@@ -1088,14 +1123,11 @@ void TMatch3Field::FillBasicChipMatrixAndTriangleList()
auto px = SE::FileToPropertyTree("match3params.xml");
Match3FieldParams.Serialize(*px);
std::vector<SE::TRenderPairList::iterator> triangleListVec;
for (size_t i = 0; i < Match3FieldParams.ChipTypeCount; i++)
{
TriangleListVector.push_back(SE::TRenderPair(Match3FieldParams.ChipTemplateParamsArr[i].SelectedRenderParams, SE::TTriangleList()));
}
auto x = RenderPairIteratorVector.front()->first;
auto y = RenderPairIteratorVector.front()->second;
renderParams.SamplerMap[SE::CONST_STRING_TEXTURE_UNIFORM] = "chip1locked";
TriangleListVector.push_back(SE::TRenderPair(renderParams, SE::TTriangleList()));
@@ -1117,6 +1149,9 @@ void TMatch3Field::FillBasicChipMatrixAndTriangleList()
TriangleListVector.push_back(SE::TRenderPair(Match3FieldParams.ChipTemplateParamsArr[i].FinishingRenderParams, SE::TTriangleList()));
}
std::vector<SE::TRenderPairList::iterator> triangleListVec;
for (SE::TRenderPairList::iterator i = TriangleListVector.begin(); i != TriangleListVector.end(); ++i)
{
@@ -1124,16 +1159,16 @@ void TMatch3Field::FillBasicChipMatrixAndTriangleList()
triangleListVec.push_back(i);
}
LeftBottomPosField = Eigen::Vector2f(150, 0);
LeftBottomPos = Eigen::Vector2f(150, 0);
FillRandomChipMatrix(triangleListVec, LeftBottomPosField);
FillRandomChipMatrix(triangleListVec, LeftBottomPos);
//Init everything
selectedChip = Eigen::Vector2i(-1, -1);
for (SE::TRenderPairList::iterator i = TriangleListVector.begin(); i != TriangleListVector.end(); ++i)
{
i->second.NeedRefreshBuffer = false;
i->second.RefreshBuffer();
}
@@ -1144,7 +1179,7 @@ Eigen::Vector2i TMatch3Field::PosToChip(Eigen::Vector2f pos)
{
int x, y;
Eigen::Vector2f fieldPos = pos - LeftBottomPosField;
Eigen::Vector2f fieldPos = pos - LeftBottomPos;
x = static_cast<int>(fieldPos[0] / Match3FieldParams.CellWidth);
y = static_cast<int>(fieldPos[1] / Match3FieldParams.CellHeight);
@@ -1311,7 +1346,7 @@ void TMatch3Field::OnMove(Eigen::Vector2f shift)
bool TMatch3Field::CheckClick(Eigen::Vector2f mousePos)
{
Eigen::Vector2f fieldPos = mousePos - LeftBottomPosField;
Eigen::Vector2f fieldPos = mousePos - LeftBottomPos;
if (fieldPos[0] >= 0 && fieldPos[0] <= Match3FieldParams.FieldWidth*Match3FieldParams.CellWidth)
{
if (fieldPos[1] >= 0 && fieldPos[1] <= Match3FieldParams.FieldHeight*Match3FieldParams.CellHeight)
jni/match3/match3field.h
+9 -2
View File
@@ -199,9 +199,12 @@ protected:
void ReplaceAnimation(Eigen::Vector2i p);
void MoveVertexListShiftBack(SE::TRenderPairList::iterator renderPairItr, size_t moveFrom);
void MoveVertexListShiftBackWithoutAnimation(SE::TRenderPairList::iterator renderPairItr, size_t moveFrom);
void MoveVertexCoordDown(SE::TRenderPairList::iterator renderPairItr, size_t moveFrom, float value);
void AddChipToUp(size_t colNum, int chipType, Eigen::Vector2f spawnPos, TChip::TChipState chipState = TChip::CS_FALLING);
void InnerAddChipToUp(size_t colNum, int chipType, Eigen::Vector2f spawnPos, TChip::TChipState chipState = TChip::CS_FALLING);
void InsertEmptyChip(size_t colNum, size_t rowNum, int chipType);
void UpdateChipSwapping(size_t dt);
@@ -237,7 +240,7 @@ public:
class TMatch3Controller;
class TMatch3Field : public TMatch3Logic
class TMatch3Field : protected TMatch3Logic
{
protected:
void FillBasicChipMatrixAndTriangleList();
@@ -249,9 +252,13 @@ protected:
Eigen::Vector2i PosToChip(Eigen::Vector2f pos);
SE::TRenderPairList TriangleListVector;
public:
//should be in protected
Eigen::Vector2f LeftBottomPos;
SE::TRenderPairList TriangleListVector;
TMatch3Field();
TMatch3Field(const TMatch3Field& m);
TMatch3Field& operator=(const TMatch3Field& m);