This commit is contained in:
vinfamy 2018-04-16 16:30:11 +07:00
parent 4d70e1dba7
commit ee410c7098
18 changed files with 13 additions and 7 deletions

View file

@ -35,7 +35,10 @@ bLoadWidgetsOnDedicatedServer=True
[/Script/Engine.Engine] [/Script/Engine.Engine]
NearClipPlane=0.010000 NearClipPlane=0.010000
MaximumLoopIterationCount=100000000 MaximumLoopIterationCount=999999999
[/Script/Engine.RecastNavMesh]
bFixedTilePoolSize=False
[/Script/Engine.PhysicsSettings] [/Script/Engine.PhysicsSettings]
DefaultGravityZ=-980.000000 DefaultGravityZ=-980.000000
@ -78,3 +81,4 @@ AsyncSceneSmoothingFactor=0.990000
InitialAverageFrameRate=0.016667 InitialAverageFrameRate=0.016667
PhysXTreeRebuildRate=10 PhysXTreeRebuildRate=10

View file

@ -63,6 +63,8 @@ DefaultViewportMouseLockMode=LockAlways
+ActionMappings=(ActionName="SpeedDown",Key=Subtract,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="SpeedDown",Key=Subtract,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
+ActionMappings=(ActionName="SwapRoles",Key=Tab,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="SwapRoles",Key=Tab,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
+ActionMappings=(ActionName="SwitchCamera",Key=C,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="SwitchCamera",Key=C,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
+ActionMappings=(ActionName="NextBuilding",Key=PageDown,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
+ActionMappings=(ActionName="PreviousBuilding",Key=PageUp,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
+AxisMappings=(AxisName="LeftRight",Key=Right,Scale=1.000000) +AxisMappings=(AxisName="LeftRight",Key=Right,Scale=1.000000)
+AxisMappings=(AxisName="LeftRight",Key=Left,Scale=-1.000000) +AxisMappings=(AxisName="LeftRight",Key=Left,Scale=-1.000000)
+AxisMappings=(AxisName="DownUp",Key=Up,Scale=1.000000) +AxisMappings=(AxisName="DownUp",Key=Up,Scale=1.000000)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/UI/Tutorial.uasset Normal file

Binary file not shown.

View file

@ -462,7 +462,7 @@ public:
/** Vinfamy added */ /** Vinfamy added */
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
FStreetMapBuilding FindBuilding(const FVector2D Point); TArray<FStreetMapBuilding> FindBuilding(const FVector2D Point);
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
FStreetMapRoad FindRoad(const FVector2D Point); FStreetMapRoad FindRoad(const FVector2D Point);

View file

@ -33,17 +33,17 @@ void UStreetMap::GetAssetRegistryTags( TArray<FAssetRegistryTag>& OutTags ) cons
} }
FStreetMapBuilding UStreetMap::FindBuilding(const FVector2D Point) TArray<FStreetMapBuilding> UStreetMap::FindBuilding(const FVector2D Point)
{ {
FStreetMapBuilding emptyBuilding; TArray<FStreetMapBuilding> FoundBuildings;
for (const auto &element : Buildings) for (const auto &element : Buildings)
{ {
if (FPolygonTools::IsPointInsidePolygon(element.BuildingPoints, Point)) if (FPolygonTools::IsPointInsidePolygon(element.BuildingPoints, Point))
{ {
return element; FoundBuildings.Add(element);
} }
} }
return emptyBuilding; return FoundBuildings;
} }
FStreetMapRoad UStreetMap::FindRoad(const FVector2D Point) FStreetMapRoad UStreetMap::FindRoad(const FVector2D Point)
@ -51,7 +51,7 @@ FStreetMapRoad UStreetMap::FindRoad(const FVector2D Point)
FStreetMapRoad emptyRoad; FStreetMapRoad emptyRoad;
for (const auto &element : Roads) for (const auto &element : Roads)
{ {
if (FPolygonTools::IsPointInsidePolygon(element.RoadPoints, Point)) if (FPolygonTools::IsPointInsidePolygon(element.RoadPoints, Point) && element.RoadName.Len() > 0)
{ {
return element; return element;
} }