Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
MasterTestProjekt
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kai Westerkamp
MasterTestProjekt
Commits
ff75af82
Commit
ff75af82
authored
Mar 31, 2017
by
wester
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rotation
parent
1b637bdd
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
2 deletions
+16
-2
Minimal_Default.umap
Content/MobileStarterContent/Maps/Minimal_Default.umap
+0
-0
Minimal_Default_BuiltData.uasset
...obileStarterContent/Maps/Minimal_Default_BuiltData.uasset
+0
-0
Tileset.cpp
Source/MasterTestProject/Tileset.cpp
+13
-1
Tileset.h
Source/MasterTestProject/Tileset.h
+3
-1
MASTERTESTPROJECT-29cd0a6.ipch
...MASTERTESTPROJECT-54f66963/MASTERTESTPROJECT-29cd0a6.ipch
+0
-0
MASTERTESTPROJECT-4286a0fc.ipch
...ASTERTESTPROJECT-77cc88b9/MASTERTESTPROJECT-4286a0fc.ipch
+0
-0
No files found.
Content/MobileStarterContent/Maps/Minimal_Default.umap
View file @
ff75af82
No preview for this file type
Content/MobileStarterContent/Maps/Minimal_Default_BuiltData.uasset
View file @
ff75af82
No preview for this file type
Source/MasterTestProject/Tileset.cpp
View file @
ff75af82
...
...
@@ -132,8 +132,20 @@ void ATilesetActor::parseInstanced3DTile(const TArray<uint8> data, FTile * tile)
for
(
FVector
pos
:
positons
)
{
outputString
+=
"["
+
pos
.
ToString
()
+
"] "
;
gltf
->
clone
(
pos
);
AProceduralEntity
*
clone
=
gltf
->
clone
(
pos
);
if
(
JsonParsed
->
GetBoolField
(
"EAST_NORTH_UP"
))
{
FVector
up
(
pos
);
up
.
Normalize
();
FVector
Z
(
0
,
0
,
1
);
FVector
east
=
FVector
::
CrossProduct
(
up
,
Z
);
FVector
north
=
FVector
::
CrossProduct
(
east
,
up
);
FMatrix
NEU
(
north
,
up
,
east
,
pos
);
clone
->
SetActorTransform
(
FTransform
(
NEU
));
}
}
gltf
->
SetActorTransform
(
FTransform
(
positons
[
0
]));
outputString
+=
"]"
;
UE_LOG
(
TILES
,
Warning
,
TEXT
(
"InStanced 3D Model Positions %s"
),
*
outputString
);
}
...
...
Source/MasterTestProject/Tileset.h
View file @
ff75af82
...
...
@@ -118,7 +118,7 @@ struct FTile
UPROPERTY
()
TArray
<
float
>
transform
;
//16 Elemete
//
TODO
"default" : [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ]
//"default" : [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ]
UPROPERTY
()
FTileContent
content
;
...
...
@@ -310,3 +310,4 @@ inline TArray<T> ATilesetActor::getAsArray(const uint8 *data, int32 offset, int3
result
.
Append
(
ArrayPointer
,
numberOfElements
);
return
result
;
}
\ No newline at end of file
ipch/MASTERTESTPROJECT-54f66963/MASTERTESTPROJECT-29cd0a6.ipch
deleted
100644 → 0
View file @
1b637bdd
File deleted
ipch/MASTERTESTPROJECT-77cc88b9/MASTERTESTPROJECT-4286a0fc.ipch
deleted
100644 → 0
View file @
1b637bdd
File deleted
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment