Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/t3d pipeline package #65

Merged
merged 33 commits into from
Nov 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
96adac8
Added folder structure and script to request CityJSON from a BAG ID
TomSimons Oct 11, 2022
e9f92c0
Added events as described in the package guidelines, still kept optio…
TomSimons Oct 12, 2022
b635b4f
Started adding CityJSON parser
TomSimons Oct 13, 2022
105e8bb
Finished basic parser and exporter. still need to add semantics in ge…
TomSimons Oct 14, 2022
1d5ff17
Added Parsing semantics and exporting them again
TomSimons Oct 14, 2022
c8374c8
Added semantic null propagation
TomSimons Oct 14, 2022
53e7033
Removed comments, checked if custom types are processed correctly
TomSimons Oct 14, 2022
69916c3
Added comments for null propagation of Semantics Values
TomSimons Oct 17, 2022
85e2784
Started adding CityJSON visualizer
TomSimons Oct 17, 2022
31a497e
Added default material, fixed mesh direction, removed vertexOffset
TomSimons Oct 17, 2022
f59dadc
added serialized option to use json center as relative RD center
TomSimons Oct 17, 2022
ffc1535
removed prints
TomSimons Oct 17, 2022
562f897
Added vertex transform processing
TomSimons Oct 17, 2022
d2e3da5
Removed Write Text File script
TomSimons Oct 17, 2022
e0a913d
cleanup
TomSimons Oct 17, 2022
f7aadfb
Removed duplicate vertices from the export
TomSimons Oct 18, 2022
cc1fd74
Fixed vertex indexing, added geographical extents to metadata node
TomSimons Oct 18, 2022
c39e6d4
Started adding annotation functionality
TomSimons Oct 18, 2022
e39ca76
Annotations can be typed and are added to the CityJSON Export
TomSimons Oct 19, 2022
3c2a298
added option for local/global id
TomSimons Oct 19, 2022
fb9fe23
Added annotation markers and tooltips
TomSimons Oct 20, 2022
d7f73cb
Added upload scripts and assets
TomSimons Oct 20, 2022
df611e6
Cleanup
TomSimons Oct 20, 2022
e1544bb
Fixed hierarchy to allow for uploading exports. Authentication token …
TomSimons Oct 21, 2022
1ef2b3e
Started adding comments
TomSimons Oct 21, 2022
a379a6b
Added missing comments, minor fixes
TomSimons Oct 23, 2022
2013a61
Fixed sample scenes
TomSimons Oct 24, 2022
ec57779
Separated Poly2Mesh into a separate dependency in ThirdPartyTools. T3…
TomSimons Nov 1, 2022
6a72528
- A CityJSON with an empty vertex list will now no longer throw an er…
TomSimons Nov 1, 2022
91bd726
Merge branch 'main' of https://github.com/Amsterdam/Netherlands3D int…
sambaas Nov 1, 2022
853da85
moved T3D samples into samples~
sambaas Nov 1, 2022
f127a30
added samples path to package.json
TomSimons Nov 1, 2022
3b610a8
Fixed missing reference
TomSimons Nov 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ X Economic Services Departments
/// </summary>
namespace Netherlands3D.Core
{
/// <summary>
/// Supported coordinate systems
/// </summary>
public enum CoordinateSystem
{
Unity,
WGS84,
RD
}

/// <summary>
/// Vector2 width Double values to represent RD-coordinates (X,Y)
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using Netherlands3D.Events;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Events;

namespace Netherlands3D.Core
{
public class Vector3EventListener : MonoBehaviour
{
[SerializeField]
private Vector3Event onEvent;

[SerializeField]
private Vector3ValueUnityEvent trigger;

void Awake()
{
if (onEvent)
{
onEvent.started.AddListener(Invoke);
}
}

public void Invoke(Vector3 value)
{
trigger.Invoke(value);
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"references": [
"GUID:9ca88277166fea644a31588b4f943acc",
"GUID:75469ad4d38634e559750d17036d5f7c",
"GUID:6055be8ebefd69e48b49212b09b47b2f"
"GUID:6055be8ebefd69e48b49212b09b47b2f",
"GUID:ac7554b4e1ace4702b59a76ef8c76499"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand Down
8 changes: 8 additions & 0 deletions Packages/Netherlands3D/T3DPipeline.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Packages/Netherlands3D/T3DPipeline/Runtime.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Packages/Netherlands3D/T3DPipeline/Runtime/Events.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 82f328a3b0832b641bb6be0a57ec68a9, type: 3}
m_Name: CityJSONParsed
m_EditorClassIdentifier:
eventName:
description:
started:
m_PersistentCalls:
m_Calls: []
received:
m_PersistentCalls:
m_Calls: []
cancelled:
m_PersistentCalls:
m_Calls: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 82f328a3b0832b641bb6be0a57ec68a9, type: 3}
m_Name: CityJSONVisualized
m_EditorClassIdentifier:
eventName:
description:
started:
m_PersistentCalls:
m_Calls: []
received:
m_PersistentCalls:
m_Calls: []
cancelled:
m_PersistentCalls:
m_Calls: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6319a1c876ebd247a42bdca122ae5c3, type: 3}
m_Name: JSONBagReceived
m_EditorClassIdentifier:
eventName:
description:
started:
m_PersistentCalls:
m_Calls: []
received:
m_PersistentCalls:
m_Calls: []
cancelled:
m_PersistentCalls:
m_Calls: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Packages/Netherlands3D/T3DPipeline/Runtime/Scripts.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
using SimpleJSON;

namespace Netherlands3D.T3DPipeline
{
/// <summary>
/// Class to hold an annotation that can be added to a building.
/// </summary>
public class Annotation
{
public int Id; // An annotation has to have an id that is unique per CityObject. It may be unique globally for all CityObjects but this is not required.
public string Text { get; set; } // The text of the annotation
public Vector3Double Position { get; private set; } //the position of the Annotation on the building

public Annotation(int id, string text, Vector3Double position)
{
Id = id;
Text = text;
Position = position;
}

public JSONNode GetJSONNode()
{
var annotation = new JSONObject();
var point = new JSONArray();
point.Add("x", Position.x);
point.Add("y", Position.y);
point.Add("z", Position.z);
annotation.Add("position", point);
annotation.Add("text", Text);
return annotation;
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading