Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/borf/BrowEdit3
Browse files Browse the repository at this point in the history
  • Loading branch information
@Borf
Borf committed Dec 18, 2023
2 parents cf24102 + 76c0703 commit 3a0e657
Show file tree
Hide file tree
Showing 10 changed files with 80 additions and 26 deletions.
1 change: 1 addition & 0 deletions browedit/HotkeyActions.cpp
View file
Expand Up @@ -185,6 +185,7 @@ void BrowEdit::registerActions()
HotkeyRegistry::registerAction(HotkeyAction::Texture_PrevTexture, [this]() { activeMapView->textureSelected = (activeMapView->textureSelected + activeMapView->map->rootNode->getComponent<Gnd>()->textures.size() - 1) % (int)activeMapView->map->rootNode->getComponent<Gnd>()->textures.size(); }, hasActiveMapViewTextureWallMode);
HotkeyRegistry::registerAction(HotkeyAction::Texture_NextTexture, [this]() { activeMapView->textureSelected = (activeMapView->textureSelected + 1) % activeMapView->map->rootNode->getComponent<Gnd>()->textures.size(); }, hasActiveMapViewTextureWallMode);
HotkeyRegistry::registerAction(HotkeyAction::Texture_SelectFull, [this]() { activeMapView->textureEditUv1 = glm::vec2(0, 0); activeMapView->textureEditUv2 = glm::vec2(1, 1); }, hasActiveMapViewTextureWallMode);
HotkeyRegistry::registerAction(HotkeyAction::Texture_Delete, [this]() { activeMapView->deleteTiles = true; }, hasActiveMapViewTextureMode);


HotkeyRegistry::registerAction(HotkeyAction::EditMode_Height, [this]() { editMode = EditMode::Height; });
Expand Down
1 change: 1 addition & 0 deletions browedit/HotkeyRegistry.h
View file
Expand Up @@ -87,6 +87,7 @@ enum class HotkeyAction
Texture_NextTexture,
Texture_PrevTexture,
Texture_SelectFull,
Texture_Delete,


GatEdit_NextTileType,
Expand Down
36 changes: 18 additions & 18 deletions browedit/MapView.Objectmode.cpp
View file
Expand Up @@ -237,30 +237,30 @@ void MapView::postRenderObjectMode(BrowEdit* browEdit)
lockedGizmo = !ImGui::GetIO().KeyCtrl;
}

if (!lockedGizmo) {
if (map->selectedNodes.size() == 1 && gadget.mode == Gadget::Mode::Rotate) {
mat = glm::rotate(mat, -glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.z), glm::vec3(0, 0, 1));
rotMat = glm::rotate(rotMat, -glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.z), glm::vec3(0, 0, 1));
if (map->selectedNodes[0]->getComponent<RswObject>()) {
if (!lockedGizmo) {
if (map->selectedNodes.size() == 1 && gadget.mode == Gadget::Mode::Rotate) {
mat = glm::rotate(mat, -glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.z), glm::vec3(0, 0, 1));
rotMat = glm::rotate(rotMat, -glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.z), glm::vec3(0, 0, 1));
}
}
}

if (map->selectedNodes.size() == 1 && gadget.mode == Gadget::Mode::Scale) {
mat = glm::rotate(mat, -glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.z), glm::vec3(0, 0, 1));
mat = glm::rotate(mat, -glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.x), glm::vec3(1, 0, 0));
mat = glm::rotate(mat, glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.y), glm::vec3(0, 1, 0));
if (map->selectedNodes.size() == 1 && gadget.mode == Gadget::Mode::Scale) {
mat = glm::rotate(mat, -glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.z), glm::vec3(0, 0, 1));
mat = glm::rotate(mat, -glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.x), glm::vec3(1, 0, 0));
mat = glm::rotate(mat, glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.y), glm::vec3(0, 1, 0));

rotMat = glm::rotate(rotMat, -glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.z), glm::vec3(0, 0, 1));
rotMat = glm::rotate(rotMat, glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.x), glm::vec3(1, 0, 0));
rotMat = glm::rotate(rotMat, glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.y), glm::vec3(0, 1, 0));
rotMat = glm::rotate(rotMat, -glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.z), glm::vec3(0, 0, 1));
rotMat = glm::rotate(rotMat, glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.x), glm::vec3(1, 0, 0));
rotMat = glm::rotate(rotMat, glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.y), glm::vec3(0, 1, 0));
}
}

gadget.draw(mouseRay, mat, !lockedGizmo ? -map->selectedNodes[0]->getComponent<RswObject>()->rotation.x : 0);
gadget.draw(mouseRay, mat, !lockedGizmo && map->selectedNodes[0]->getComponent<RswObject>() ? -map->selectedNodes[0]->getComponent<RswObject>()->rotation.x : 0);

if (!lockedGizmo) {
if (map->selectedNodes.size() == 1 && gadget.mode == Gadget::Mode::Rotate) {
if (gadget.selectedAxis == Gadget::Axis::Y) {
rotMat = glm::rotate(rotMat, glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.x), glm::vec3(1, 0, 0));
}
if (!lockedGizmo && map->selectedNodes[0]->getComponent<RswObject>() && map->selectedNodes.size() == 1 && gadget.mode == Gadget::Mode::Rotate) {
if (gadget.selectedAxis == Gadget::Axis::Y) {
rotMat = glm::rotate(rotMat, glm::radians(map->selectedNodes[0]->getComponent<RswObject>()->rotation.x), glm::vec3(1, 0, 0));
}
}

Expand Down
28 changes: 23 additions & 5 deletions browedit/MapView.Texturemode.cpp
View file
Expand Up @@ -245,11 +245,30 @@ void MapView::postRenderTextureMode(BrowEdit* browEdit)
simpleShader->setUniform(SimpleShader::Uniforms::lightMin, 0.5f);
}




if (hovered && mouse3D != glm::vec3(std::numeric_limits<float>::max()))
{
if (deleteTiles && browEdit->textureStamp.size() == 0)
{
auto ga = new GroupAction();
deleteTiles = false;

glm::ivec2 tileHovered((int)glm::floor(mouse3D.x / 10), (gnd->height - (int)glm::floor(mouse3D.z) / 10));
glm::ivec2 topleft = tileHovered - glm::ivec2(textureBrushWidth / 2, textureBrushHeight / 2);

for (int x = 0; x < textureBrushWidth; x++)
{
for (int y = 0; y < textureBrushHeight; y++)
{
if (topleft.x + x >= gnd->width || topleft.x + x < 0 || topleft.y + y >= gnd->height || topleft.y + y < 0)
continue;
auto cube = gnd->cubes[topleft.x + x][topleft.y + y];
ga->addAction(new CubeTileChangeAction(glm::ivec2(topleft.x + x, topleft.y + y), cube, -1, cube->tileFront, cube->tileSide));
cube->tileUp = -1;
}
}

map->doAction(ga, browEdit);
}
if (ImGui::IsMouseDown(0) && ImGui::GetIO().KeyShift)
{//dragging mouse to show preview
if (!mouseDown)
Expand Down Expand Up @@ -1003,8 +1022,7 @@ void MapView::postRenderTextureMode(BrowEdit* browEdit)
}
}



deleteTiles = false;
fbo->unbind();

}
Expand Down
1 change: 1 addition & 0 deletions browedit/MapView.h
View file
Expand Up @@ -144,6 +144,7 @@ class MapView
textureBrushFlipV = (mask & 1) != 0;
}

bool deleteTiles = false;
int wallWidth = 4;
float wallTop = 0;
bool wallTopAuto = true;
Expand Down
12 changes: 11 additions & 1 deletion browedit/actions/ObjectChangeAction.h
View file
Expand Up @@ -4,6 +4,7 @@
#include <browedit/Node.h>
#include <browedit/components/RsmRenderer.h>
#include <browedit/components/GndRenderer.h>
#include <browedit/components/WaterRenderer.h>

template<class T>
class ObjectChangeAction : public Action
Expand Down Expand Up @@ -32,7 +33,11 @@ class ObjectChangeAction : public Action
auto gndRenderer = node->getComponent<GndRenderer>();
if (gndRenderer)
gndRenderer->setChunksDirty(); //TODO : only set this specific chunk dirty

auto waterRenderer = node->getComponent<WaterRenderer>();
if (waterRenderer) {
waterRenderer->renderFullWater = false;
waterRenderer->setDirty();
}
if ((std::string*)ptr == &(node->name))
node->onRename(map);
}
Expand All @@ -45,6 +50,11 @@ class ObjectChangeAction : public Action
auto gndRenderer = node->getComponent<GndRenderer>();
if (gndRenderer)
gndRenderer->setChunksDirty(); //TODO : only set this specific chunk dirty
auto waterRenderer = node->getComponent<WaterRenderer>();
if (waterRenderer) {
waterRenderer->renderFullWater = false;
waterRenderer->setDirty();
}
if ((std::string*)ptr == &(node->name))
node->onRename(map);
}
Expand Down
9 changes: 8 additions & 1 deletion browedit/components/Rsw.cpp
View file
Expand Up @@ -781,7 +781,14 @@ void Rsw::buildImGui(BrowEdit* browEdit)
auto waterRenderer = node->getComponent<WaterRenderer>();
waterRenderer->reloadTextures();
}
util::DragFloat(browEdit, browEdit->activeMapView->map, node, "Height", &water.height, 0.1f, -100, 100);
if (util::DragFloat(browEdit, browEdit->activeMapView->map, node, "Height", &water.height, 0.1f, -100, 100)) {
auto waterRenderer = node->getComponent<WaterRenderer>();

if (!waterRenderer->renderFullWater) {
waterRenderer->renderFullWater = true;
waterRenderer->setDirty();
}
}
util::DragFloat(browEdit, browEdit->activeMapView->map, node, "Wave Height", &water.amplitude, 0.1f, -100, 100);
util::DragInt(browEdit, browEdit->activeMapView->map, node, "Texture Animation Speed", &water.textureAnimSpeed, 1, 0, 1000);
util::DragFloat(browEdit, browEdit->activeMapView->map, node, "Wave Speed", &water.waveSpeed, 0.1f, -100, 100);
Expand Down
15 changes: 15 additions & 0 deletions browedit/components/WaterRenderer.cpp
View file
Expand Up @@ -41,13 +41,28 @@ void WaterRenderer::render()
if (!vbo || dirty)
{
auto gnd = node->getComponent<Gnd>();
float waveHeight = -9999;

if (rsw)
waveHeight = rsw->water.height - rsw->water.amplitude;

if(!vbo)
vbo = new gl::VBO<VertexP3T2>();
std::vector<VertexP3T2> verts;
for (int x = 0; x < gnd->width; x++)
{
for (int y = 0; y < gnd->height; y++)
{
auto c = gnd->cubes[x][gnd->height - y - 1];

if (!this->renderFullWater) {
if (c->tileUp == -1)
continue;

if (c->heights[0] <= waveHeight && c->heights[1] <= waveHeight && c->heights[2] <= waveHeight && c->heights[3] <= waveHeight)
continue;
}

verts.push_back(VertexP3T2(glm::vec3(10 * x, 0, 10 * (y+1)), glm::vec2((x % 4) * 0.25f + 0.00f, (y % 4) * 0.25f + 0.00f)));
verts.push_back(VertexP3T2(glm::vec3(10 * (x+1), 0, 10 * (y+1)), glm::vec2((x % 4) * 0.25f + 0.25f, (y % 4) * 0.25f + 0.00f)));
verts.push_back(VertexP3T2(glm::vec3(10 * (x+1), 0, 10 * (y+2)), glm::vec2((x % 4) * 0.25f + 0.25f, (y % 4) * 0.25f + 0.25f)));
Expand Down
1 change: 1 addition & 0 deletions browedit/components/WaterRenderer.h
View file
Expand Up @@ -32,6 +32,7 @@ class WaterRenderer : public Renderer
gl::VBO<VertexP3T2>* vbo = nullptr;
bool dirty = true;
bool viewFog = false;
bool renderFullWater = false;

WaterRenderer();
~WaterRenderer();
Expand Down
2 changes: 1 addition & 1 deletion data/defaulthotkeys.json
View file
@@ -1 +1 @@
{"Camera_MoveXNegative":{"keyCode":324,"modifiers":0},"Camera_MoveXPositive":{"keyCode":326,"modifiers":0},"Camera_MoveYNegative":{"keyCode":329,"modifiers":0},"Camera_MoveYPositive":{"keyCode":327,"modifiers":0},"Camera_MoveZNegative":{"keyCode":322,"modifiers":0},"Camera_MoveZPositive":{"keyCode":328,"modifiers":0},"Camera_OrthoPerspective":{"keyCode":325,"modifiers":0},"Camera_RotateX45Negative":{"keyCode":323,"modifiers":0},"Camera_RotateX45Positive":{"keyCode":321,"modifiers":0},"Camera_RotateY45Negative":{"keyCode":330,"modifiers":0},"Camera_RotateY45Positive":{"keyCode":320,"modifiers":0},"EditMode_Cinematic":{"keyCode":298,"modifiers":0},"EditMode_Color":{"keyCode":295,"modifiers":0},"EditMode_Gat":{"keyCode":294,"modifiers":0},"EditMode_Height":{"keyCode":290,"modifiers":0},"EditMode_Object":{"keyCode":292,"modifiers":0},"EditMode_Shadow":{"keyCode":296,"modifiers":0},"EditMode_Sprite":{"keyCode":297,"modifiers":0},"EditMode_Texture":{"keyCode":291,"modifiers":0},"EditMode_Wall":{"keyCode":293,"modifiers":0},"GatEdit_NextTileType":{"keyCode":91,"modifiers":0},"GatEdit_PrevTileType":{"keyCode":93,"modifiers":0},"GatEdit_Tile0":{"keyCode":49,"modifiers":0},"GatEdit_Tile1":{"keyCode":50,"modifiers":0},"GatEdit_Tile2":{"keyCode":51,"modifiers":0},"GatEdit_Tile3":{"keyCode":52,"modifiers":0},"GatEdit_Tile4":{"keyCode":53,"modifiers":0},"GatEdit_Tile5":{"keyCode":54,"modifiers":0},"GatEdit_Tile6":{"keyCode":55,"modifiers":0},"GatEdit_Tile7":{"keyCode":56,"modifiers":0},"GatEdit_Tile8":{"keyCode":57,"modifiers":0},"GatEdit_Tile9":{"keyCode":48,"modifiers":0},"GatEdit_AdjustToGround":{"keyCode":32,"modifiers":1},"Global_CalculateLightmaps":{"keyCode":76,"modifiers":1},"Global_CalculateQuadtree":{"keyCode":81,"modifiers":1},"Global_Copy":{"keyCode":67,"modifiers":1},"Global_Exit":{"keyCode":27,"modifiers":0},"Global_HotkeyPopup":{"keyCode":32,"modifiers":0},"Global_Load":{"keyCode":79,"modifiers":1},"Global_New":{"keyCode":78,"modifiers":1},"Global_Paste":{"keyCode":86,"modifiers":1},"Global_PasteChangeHeight":{"keyCode":86,"modifiers":0},"Global_Redo":{"keyCode":90,"modifiers":3},"Global_ReloadModels":{"keyCode":82,"modifiers":2},"Global_ReloadTextures":{"keyCode":82,"modifiers":1},"Global_Save":{"keyCode":83,"modifiers":1},"Global_Settings":{"keyCode":80,"modifiers":1},"Global_Undo":{"keyCode":90,"modifiers":1},"ObjectEdit_CreatePrefab":{"keyCode":0,"modifiers":0},"ObjectEdit_Delete":{"keyCode":261,"modifiers":0},"ObjectEdit_FlipHorizontal":{"keyCode":72,"modifiers":0},"ObjectEdit_FlipVertical":{"keyCode":86,"modifiers":0},"ObjectEdit_FocusOnSelection":{"keyCode":70,"modifiers":0},"ObjectEdit_HighlightInObjectPicker":{"keyCode":0,"modifiers":0},"ObjectEdit_InvertScaleX":{"keyCode":88,"modifiers":0},"ObjectEdit_InvertScaleY":{"keyCode":89,"modifiers":0},"ObjectEdit_InvertScaleZ":{"keyCode":90,"modifiers":0},"ObjectEdit_InvertSelection":{"keyCode":73,"modifiers":1},"ObjectEdit_Move":{"keyCode":49,"modifiers":0},"ObjectEdit_NudgeXNeg":{"keyCode":263,"modifiers":0},"ObjectEdit_NudgeXPos":{"keyCode":262,"modifiers":0},"ObjectEdit_NudgeYNeg":{"keyCode":0,"modifiers":0},"ObjectEdit_NudgeYPos":{"keyCode":0,"modifiers":0},"ObjectEdit_NudgeZNeg":{"keyCode":265,"modifiers":0},"ObjectEdit_NudgeZPos":{"keyCode":264,"modifiers":0},"ObjectEdit_RotXNeg":{"keyCode":0,"modifiers":0},"ObjectEdit_RotXPos":{"keyCode":0,"modifiers":0},"ObjectEdit_RotYNeg":{"keyCode":0,"modifiers":0},"ObjectEdit_RotYPos":{"keyCode":0,"modifiers":0},"ObjectEdit_RotZNeg":{"keyCode":0,"modifiers":0},"ObjectEdit_RotZPos":{"keyCode":0,"modifiers":0},"ObjectEdit_Rotate":{"keyCode":50,"modifiers":0},"ObjectEdit_Scale":{"keyCode":51,"modifiers":0},"ObjectEdit_SelectAll":{"keyCode":65,"modifiers":1},"ObjectEdit_SelectAllEffects":{"keyCode":0,"modifiers":0},"ObjectEdit_SelectAllLights":{"keyCode":0,"modifiers":0},"ObjectEdit_SelectAllModels":{"keyCode":0,"modifiers":0},"ObjectEdit_SelectAllSounds":{"keyCode":0,"modifiers":0},"ObjectEdit_ToggleObjectWindow":{"keyCode":0,"modifiers":0},"TextureEdit_SwapBrushSize":{"keyCode":0,"modifiers":0},"TextureEdit_ToggleTextureWindow":{"keyCode":0,"modifiers":0},"Texture_NextTexture":{"keyCode":93,"modifiers":0},"Texture_PrevTexture":{"keyCode":91,"modifiers":0},"Texture_SelectFull":{"keyCode":70,"modifiers":0},"View_ColorMap":{"keyCode":0,"modifiers":0},"View_EmptyTiles":{"keyCode":0,"modifiers":0},"View_GatTiles":{"keyCode":0,"modifiers":0},"View_Lighting":{"keyCode":0,"modifiers":0},"View_Models":{"keyCode":77,"modifiers":0},"View_ShadowMap":{"keyCode":0,"modifiers":0},"View_SmoothColormap":{"keyCode":0,"modifiers":0},"View_Textures":{"keyCode":0,"modifiers":0},"View_TileColors":{"keyCode":0,"modifiers":0},"WallEdit_AddWall":{"keyCode":334,"modifiers":0},"WallEdit_OffsetLower":{"keyCode":263,"modifiers":0},"WallEdit_OffsetRaise":{"keyCode":262,"modifiers":0},"WallEdit_Preview":{"keyCode":80,"modifiers":0},"WallEdit_ReApply":{"keyCode":65,"modifiers":0},"WallEdit_RemoveWall":{"keyCode":333,"modifiers":0},"WallEdit_SizeLower":{"keyCode":263,"modifiers":2},"WallEdit_SizeRaise":{"keyCode":262,"modifiers":2}}
{"Camera_MoveXNegative":{"keyCode":324,"modifiers":0},"Camera_MoveXPositive":{"keyCode":326,"modifiers":0},"Camera_MoveYNegative":{"keyCode":329,"modifiers":0},"Camera_MoveYPositive":{"keyCode":327,"modifiers":0},"Camera_MoveZNegative":{"keyCode":322,"modifiers":0},"Camera_MoveZPositive":{"keyCode":328,"modifiers":0},"Camera_OrthoPerspective":{"keyCode":325,"modifiers":0},"Camera_RotateX45Negative":{"keyCode":323,"modifiers":0},"Camera_RotateX45Positive":{"keyCode":321,"modifiers":0},"Camera_RotateY45Negative":{"keyCode":330,"modifiers":0},"Camera_RotateY45Positive":{"keyCode":320,"modifiers":0},"EditMode_Cinematic":{"keyCode":298,"modifiers":0},"EditMode_Color":{"keyCode":295,"modifiers":0},"EditMode_Gat":{"keyCode":294,"modifiers":0},"EditMode_Height":{"keyCode":290,"modifiers":0},"EditMode_Object":{"keyCode":292,"modifiers":0},"EditMode_Shadow":{"keyCode":296,"modifiers":0},"EditMode_Sprite":{"keyCode":297,"modifiers":0},"EditMode_Texture":{"keyCode":291,"modifiers":0},"EditMode_Wall":{"keyCode":293,"modifiers":0},"GatEdit_NextTileType":{"keyCode":91,"modifiers":0},"GatEdit_PrevTileType":{"keyCode":93,"modifiers":0},"GatEdit_Tile0":{"keyCode":49,"modifiers":0},"GatEdit_Tile1":{"keyCode":50,"modifiers":0},"GatEdit_Tile2":{"keyCode":51,"modifiers":0},"GatEdit_Tile3":{"keyCode":52,"modifiers":0},"GatEdit_Tile4":{"keyCode":53,"modifiers":0},"GatEdit_Tile5":{"keyCode":54,"modifiers":0},"GatEdit_Tile6":{"keyCode":55,"modifiers":0},"GatEdit_Tile7":{"keyCode":56,"modifiers":0},"GatEdit_Tile8":{"keyCode":57,"modifiers":0},"GatEdit_Tile9":{"keyCode":48,"modifiers":0},"GatEdit_AdjustToGround":{"keyCode":32,"modifiers":1},"Global_CalculateLightmaps":{"keyCode":76,"modifiers":1},"Global_CalculateQuadtree":{"keyCode":81,"modifiers":1},"Global_Copy":{"keyCode":67,"modifiers":1},"Global_Exit":{"keyCode":27,"modifiers":0},"Global_HotkeyPopup":{"keyCode":32,"modifiers":0},"Global_Load":{"keyCode":79,"modifiers":1},"Global_New":{"keyCode":78,"modifiers":1},"Global_Paste":{"keyCode":86,"modifiers":1},"Global_PasteChangeHeight":{"keyCode":86,"modifiers":0},"Global_Redo":{"keyCode":90,"modifiers":3},"Global_ReloadModels":{"keyCode":82,"modifiers":2},"Global_ReloadTextures":{"keyCode":82,"modifiers":1},"Global_Save":{"keyCode":83,"modifiers":1},"Global_Settings":{"keyCode":80,"modifiers":1},"Global_Undo":{"keyCode":90,"modifiers":1},"ObjectEdit_CreatePrefab":{"keyCode":0,"modifiers":0},"ObjectEdit_Delete":{"keyCode":261,"modifiers":0},"ObjectEdit_FlipHorizontal":{"keyCode":72,"modifiers":0},"ObjectEdit_FlipVertical":{"keyCode":86,"modifiers":0},"ObjectEdit_FocusOnSelection":{"keyCode":70,"modifiers":0},"ObjectEdit_HighlightInObjectPicker":{"keyCode":0,"modifiers":0},"ObjectEdit_InvertScaleX":{"keyCode":88,"modifiers":0},"ObjectEdit_InvertScaleY":{"keyCode":89,"modifiers":0},"ObjectEdit_InvertScaleZ":{"keyCode":90,"modifiers":0},"ObjectEdit_InvertSelection":{"keyCode":73,"modifiers":1},"ObjectEdit_Move":{"keyCode":49,"modifiers":0},"ObjectEdit_NudgeXNeg":{"keyCode":263,"modifiers":0},"ObjectEdit_NudgeXPos":{"keyCode":262,"modifiers":0},"ObjectEdit_NudgeYNeg":{"keyCode":0,"modifiers":0},"ObjectEdit_NudgeYPos":{"keyCode":0,"modifiers":0},"ObjectEdit_NudgeZNeg":{"keyCode":265,"modifiers":0},"ObjectEdit_NudgeZPos":{"keyCode":264,"modifiers":0},"ObjectEdit_RotXNeg":{"keyCode":0,"modifiers":0},"ObjectEdit_RotXPos":{"keyCode":0,"modifiers":0},"ObjectEdit_RotYNeg":{"keyCode":0,"modifiers":0},"ObjectEdit_RotYPos":{"keyCode":0,"modifiers":0},"ObjectEdit_RotZNeg":{"keyCode":0,"modifiers":0},"ObjectEdit_RotZPos":{"keyCode":0,"modifiers":0},"ObjectEdit_Rotate":{"keyCode":50,"modifiers":0},"ObjectEdit_Scale":{"keyCode":51,"modifiers":0},"ObjectEdit_SelectAll":{"keyCode":65,"modifiers":1},"ObjectEdit_SelectAllEffects":{"keyCode":0,"modifiers":0},"ObjectEdit_SelectAllLights":{"keyCode":0,"modifiers":0},"ObjectEdit_SelectAllModels":{"keyCode":0,"modifiers":0},"ObjectEdit_SelectAllSounds":{"keyCode":0,"modifiers":0},"ObjectEdit_ToggleObjectWindow":{"keyCode":0,"modifiers":0},"TextureEdit_SwapBrushSize":{"keyCode":0,"modifiers":0},"TextureEdit_ToggleTextureWindow":{"keyCode":0,"modifiers":0},"Texture_NextTexture":{"keyCode":93,"modifiers":0},"Texture_PrevTexture":{"keyCode":91,"modifiers":0},"Texture_SelectFull":{"keyCode":70,"modifiers":0},"Texture_Delete":{"keyCode":259,"modifiers":0},"View_ColorMap":{"keyCode":0,"modifiers":0},"View_EmptyTiles":{"keyCode":0,"modifiers":0},"View_GatTiles":{"keyCode":0,"modifiers":0},"View_Lighting":{"keyCode":0,"modifiers":0},"View_Models":{"keyCode":77,"modifiers":0},"View_ShadowMap":{"keyCode":0,"modifiers":0},"View_SmoothColormap":{"keyCode":0,"modifiers":0},"View_Textures":{"keyCode":0,"modifiers":0},"View_TileColors":{"keyCode":0,"modifiers":0},"WallEdit_AddWall":{"keyCode":334,"modifiers":0},"WallEdit_OffsetLower":{"keyCode":263,"modifiers":0},"WallEdit_OffsetRaise":{"keyCode":262,"modifiers":0},"WallEdit_Preview":{"keyCode":80,"modifiers":0},"WallEdit_ReApply":{"keyCode":65,"modifiers":0},"WallEdit_RemoveWall":{"keyCode":333,"modifiers":0},"WallEdit_SizeLower":{"keyCode":263,"modifiers":2},"WallEdit_SizeRaise":{"keyCode":262,"modifiers":2}}

0 comments on commit 3a0e657

Please sign in to comment.