yvt/openspades
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some changes

Browse Source 
Yellow cursor no longer visible, only shows at the ends of an !active block line
Normal block cursor is the one with the corners only
Solid frame cursor is used when making a line, the corners-only one doesn't look good on lines
This commit is contained in:
teodor6140 2019-05-24 21:10:52 +03:00
parent 843f1434e5
commit ab9521c6ff
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Resources/Models/MapObjects/BlockCursorActive.kv6 → Resources/Models/MapObjects/BlockCursorLine.kv6
View File

0
Resources/Models/MapObjects/BlockCursorInactive.kv6 → Resources/Models/MapObjects/BlockCursorSingle.kv6
View File

4
Sources/Client/Client.cpp
View File

@ -324,8 +324,8 @@ namespace spades {
renderer->RegisterModel("Models/Player/Head.kv6");
renderer->RegisterModel("Models/MapObjects/Intel.kv6");
renderer->RegisterModel("Models/MapObjects/CheckPoint.kv6");
renderer->RegisterModel("Models/MapObjects/BlockCursorActive.kv6");
renderer->RegisterModel("Models/MapObjects/BlockCursorInactive.kv6");
renderer->RegisterModel("Models/MapObjects/BlockCursorLine.kv6");
renderer->RegisterModel("Models/MapObjects/BlockCursorSingle.kv6");
renderer->RegisterImage("Gfx/Bullet/7.62mm.png");
renderer->RegisterImage("Gfx/Bullet/9mm.png");
renderer->RegisterImage("Gfx/Bullet/12gauge.png");

7
Sources/Client/Client_Scene.cpp
View File

@ -653,15 +653,16 @@ namespace spades {
if ((int)blocks.size() > p->GetNumBlocks())
color = MakeVector3(1.f, 0.f, 0.f);
IModel *curActive = renderer->RegisterModel("Models/MapObjects/BlockCursorActive.kv6");
IModel *curInactive = renderer->RegisterModel("Models/MapObjects/BlockCursorInactive.kv6");
IModel *curLine = renderer->RegisterModel("Models/MapObjects/BlockCursorLine.kv6");
IModel *curSingle = renderer->RegisterModel("Models/MapObjects/BlockCursorSingle.kv6");
for (size_t i = 0; i < blocks.size(); i++) {
if (!active && (blocks.size() == 1 || (i > 0 && i < blocks.size() - 1))) continue;
IntVector3 &v = blocks[i];
ModelRenderParam param;
param.customColor = color;
param.matrix = Matrix4::Translate(MakeVector3(v.x + .5f, v.y + .5f, v.z + .5f));
param.matrix = param.matrix * Matrix4::Scale(1.f / 24.f);
renderer->RenderModel(active ? curActive : curInactive, param);
renderer->RenderModel(blocks.size() > 1 ? curLine : curSingle, param);
}
}