Ticket #1163: 1163.6.diff
File 1163.6.diff, 4.7 KB (added by , 9 years ago) |
---|
-
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp
1 /* Copyright (C) 201 4Wildfire Games.1 /* Copyright (C) 2015 Wildfire Games. 2 2 * This file is part of 0 A.D. 3 3 * 4 4 * 0 A.D. is free software: you can redistribute it and/or modify … … 366 359 { 367 360 if (evt.LeftUp()) 368 361 { 362 POST_MESSAGE(UpdateVisualSelectedObjects, ()); 369 363 SET_STATE(Waiting); 370 364 return true; 371 365 } -
source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
1 /* Copyright (C) 201 4Wildfire Games.1 /* Copyright (C) 2015 Wildfire Games. 2 2 * This file is part of 0 A.D. 3 3 * 4 4 * 0 A.D. is free software: you can redistribute it and/or modify … … 41 41 #include "renderer/Renderer.h" 42 42 #include "renderer/WaterManager.h" 43 43 #include "simulation2/Simulation2.h" 44 #include "simulation2/components/ICmpObstruction.h" 44 45 #include "simulation2/components/ICmpOwnership.h" 45 46 #include "simulation2/components/ICmpPosition.h" 46 47 #include "simulation2/components/ICmpPlayer.h" … … 61 62 } 62 63 } 63 64 65 // Helpers for object constraints 66 bool CanPlaceObjectEntityHelper(entity_id_t ent) 67 { 68 CmpPtr<ICmpObstruction> cmpObstruction(*g_Game->GetSimulation2(), ent); 69 if (cmpObstruction) 70 { 71 ICmpObstruction::EFoundationCheck result = cmpObstruction->CheckFoundation("default"); 72 if (result != ICmpObstruction::FOUNDATION_CHECK_SUCCESS) 73 return false; 74 } 75 return true; 76 } 77 78 void CheckObstructionAndUpdateVisual(entity_id_t id) 79 { 80 // Check build Constraint 81 CmpPtr<ICmpVisual> cmpVisual(*g_Game->GetSimulation2(), id); 82 if (cmpVisual) 83 { 84 if (!CanPlaceObjectEntityHelper(id)) 85 cmpVisual->SetShadingColour(fixed::FromDouble(1.4), fixed::FromDouble(0.4), fixed::FromDouble(0.4), fixed::FromDouble(1)); 86 else 87 cmpVisual->SetShadingColour(fixed::FromDouble(1), fixed::FromDouble(1), fixed::FromDouble(1), fixed::FromDouble(1)); 88 } 89 } 90 64 91 QUERYHANDLER(GetObjectsList) 65 92 { 66 93 std::vector<sObjectsListItem> objects; … … 473 500 posFinal = posFixed + dir; 474 501 } 475 502 cmpPosition->JumpTo(posFinal.X, posFinal.Z); 503 504 // Check build Constraint 505 CheckObstructionAndUpdateVisual(id); 476 506 } 477 507 } 478 508 … … 543 573 CmpPtr<ICmpOwnership> cmpOwnership(*g_Game->GetSimulation2(), g_PreviewEntityID); 544 574 if (cmpOwnership) 545 575 cmpOwnership->SetOwner((player_id_t)msg->settings->player); 576 577 // Check build Constraint 578 CheckObstructionAndUpdateVisual(g_PreviewEntityID); 546 579 } 547 580 } 548 581 … … 680 713 msg->ids = EntitySelection::PickSimilarEntities(*g_Game->GetSimulation2(), *g_Game->GetView()->GetCamera(), templateName, owner, false, true, true, false); 681 714 } 682 715 716 MESSAGEHANDLER(UpdateVisualSelectedObjects) 717 { 718 UNUSED(msg); 719 if (g_Selection.empty()) 720 return; 683 721 722 for (size_t i = 0; i < g_Selection.size(); ++i) 723 { 724 CmpPtr<ICmpVisual> cmpVisual(*g_Game->GetSimulation2(), g_Selection[i]); 725 if (cmpVisual) 726 cmpVisual->SetShadingColour(fixed::FromDouble(1), fixed::FromDouble(1), fixed::FromDouble(1), fixed::FromDouble(1)); 727 } 728 } 729 684 730 BEGIN_COMMAND(MoveObjects) 685 731 { 686 732 // Mapping from object to position … … 736 782 ObjectPositionMap::iterator it; 737 783 for (it = map.begin(); it != map.end(); ++it) 738 784 { 739 CmpPtr<ICmpPosition> cmpPosition(*g_Game->GetSimulation2(), (entity_id_t)it->first); 785 entity_id_t id = (entity_id_t)it->first; 786 CmpPtr<ICmpPosition> cmpPosition(*g_Game->GetSimulation2(), id); 740 787 if (!cmpPosition) 741 788 return; 742 789 … … 743 790 // Set 2D position, ignoring height 744 791 CVector3D pos = it->second; 745 792 cmpPosition->JumpTo(entity_pos_t::FromFloat(pos.X), entity_pos_t::FromFloat(pos.Z)); 793 794 // Check build Constraint 795 CheckObstructionAndUpdateVisual(id); 746 796 } 747 797 } 748 798 -
source/tools/atlas/GameInterface/Messages.h
1 /* Copyright (C) 201 4Wildfire Games.1 /* Copyright (C) 2015 Wildfire Games. 2 2 * This file is part of 0 A.D. 3 3 * 4 4 * 0 A.D. is free software: you can redistribute it and/or modify … … 573 577 ((std::vector<ObjectID>, ids)) 574 578 ); 575 579 580 MESSAGE(UpdateVisualSelectedObjects, ); 581 576 582 COMMAND(MoveObjects, MERGE, 577 583 ((std::vector<ObjectID>, ids)) 578 584 ((ObjectID, pivot))