Commit cc980e2e authored by Byurrrer's avatar Byurrrer

исправил ошибку при создании директории в своем диалоге, исправил ошибку при...

исправил ошибку при создании директории в своем диалоге, исправил ошибку при которой файлы материалов сохранялись с неправильным именем, исправил ошибку при которой трансформация не применялась к bound света, исправил ошибку при которой выделение игровых объектов в редакторе уровней рисовалось без трансформаций, добавил всплывающие подсказки у элементов верхнего тулбара
parent f7094701
......@@ -150,6 +150,7 @@ LRESULT ButtonCreateNew_Click(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
dialog_seldir::pEditCreateNew->setText("");
dialog_seldir::InitDataListBox(dialog_seldir::sCurrPath.c_str());
}
dialog_seldir::pListBox->setFocus();
}
return 0;
......
common @ b462b5ba
Subproject commit b4c0ba21be293cf576b0b2d0d90ded3bf5acc3a8
Subproject commit b462b5ba29bf653c7309564ce4cc2d0718fffd03
......@@ -217,19 +217,6 @@ SX_LIB_API void SXGame_EditorRender(ID id, ID id_sel_tex)
if (!pStartPoint)
return;
/*CFuncTrain * pTrain = (CFuncTrain*)(GameData::m_pMgr->findEntityByClass("func_train"));
if (pTrain)
{
pTrain->start();
}
CPointCamera * cam = (CPointCamera*)(GameData::m_pMgr->findEntityByName("train_camera"));
if (cam)
{
GameData::m_pActiveCamera = cam;
cam->setParent();
}*/
CPathCorner * pCur = pStartPoint;
while ((pCur = pCur->GetPrev()))
{
......@@ -286,19 +273,13 @@ SX_LIB_API void SXGame_EditorRender(ID id, ID id_sel_tex)
}
else
{
float3 min, max;
bEnt->getMinMax(&min, &max);
if (min.x == 0.0f && min.y == 0.0f && min.z == 0.0f && max.x == 0.0f && max.y == 0.0f && max.z == 0.0f)
max.x = max.y = max.z = 0.5f;
SMMATRIX mView, mProj;
Core_RMatrixGet(G_RI_MATRIX_VIEW, &mView);
Core_RMatrixGet(G_RI_MATRIX_PROJECTION, &mProj);
SGCore_GetDXDevice()->SetTransform(D3DTS_VIEW, (D3DMATRIX*)&mView);
SGCore_GetDXDevice()->SetTransform(D3DTS_PROJECTION, (D3DMATRIX*)&mProj);
SGCore_GetDXDevice()->SetTransform(D3DTS_WORLD, (D3DMATRIX*)&(SMMatrixScaling((max.x - min.x), (max.y - min.y), (max.z - min.z)) * SMMatrixTranslation(bEnt->getPos())));
//SGCore_GetDXDevice()->SetTransform(D3DTS_WORLD, (D3DMATRIX*)&bEnt->getWorldTM());
SGCore_GetDXDevice()->SetTransform(D3DTS_WORLD, (D3DMATRIX*)&(bEnt->getOrient().GetMatrix() * SMMatrixTranslation(bEnt->getPos()))/*bEnt->getWorldTM()*/);
SGCore_GetDXDevice()->SetTexture(0, SGCore_LoadTexGetTex(id_sel_tex));
g_pFigureBox->DrawSubset(0);
......
......@@ -645,7 +645,11 @@ void CLights::setLightOrient(ID id, const SMQuaternion* q)
m_aLights[id]->m_qQuaternion = *q;
if (m_aLights[id]->m_pShadowSM)
{
float4x4 mpos = SMMatrixTranslation(m_aLights[id]->m_vPosition.x, m_aLights[id]->m_vPosition.y, m_aLights[id]->m_vPosition.z);
m_aLights[id]->m_mWorldMat = m_aLights[id]->m_qQuaternion.GetMatrix() * mpos;
m_aLights[id]->m_pShadowSM->setDirection(&(m_aLights[id]->m_qQuaternion * LIGHTS_DIR_BASE));
}
lightCountUpdateNull(id);
}
......
......@@ -1461,7 +1461,7 @@ void rfunc::RenderMainPostProcess(DWORD timeDelta)
static const bool * pp_bloom = GET_PCVAR_BOOL("pp_bloom");
if (pp_bloom && (*pp_bloom))
SPP_RenderBloom(&float3_t(1, 0.7, 1.0));
SPP_RenderBloom(&float3_t(1, 0.2, 1.5));
//**********************************************************************
......
......@@ -360,6 +360,8 @@ LRESULT SXLevelEditor_ButtonGeometryOpen_Click(HWND hWnd, UINT uiMsg, WPARAM wPa
level_editor::GeomActivateCreate(true);
//level_editor::GeomActivateTrans(false);
level_editor::NullingButtonSelTransform();
return 0;
}
......@@ -374,6 +376,8 @@ LRESULT SXLevelEditor_ButtonGreenOpen_Click(HWND hWnd, UINT uiMsg, WPARAM wParam
level_editor::GreenActivateCreate(true);
level_editor::AIGridActivateAll(false);
level_editor::GreenActivateMain(true);
level_editor::NullingButtonSelTransform();
return 0;
}
......@@ -387,6 +391,8 @@ LRESULT SXLevelEditor_ButtonGameObjectOpen_Click(HWND hWnd, UINT uiMsg, WPARAM w
level_editor::AIGridActivateAll(false);
level_editor::GameVisible4Properties(true);
level_editor::NullingButtonSelTransform();
return 0;
}
......@@ -404,6 +410,8 @@ LRESULT SXLevelEditor_ButtonAIGridOpen_Click(HWND hWnd, UINT uiMsg, WPARAM wPara
level_editor::iActiveGroupType = EDITORS_LEVEL_GROUPTYPE_AIGRID;
level_editor::idActiveElement = -1;
level_editor::NullingButtonSelTransform();
return 0;
}
......
This diff is collapsed.
......@@ -282,6 +282,8 @@ namespace level_editor
//!
void LEdeleteRenderData();
void NullingButtonSelTransform();
//**********************************************************************
//! ( ), useMessage -
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment