-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
3D Tiles #5308
3D Tiles #5308
Changes from 1 commit
afca34c
60f303e
dff65a6
02f0db3
bc64040
44e6d9e
8153ff3
85e4976
34e664b
d53054f
df45e53
2c78cc9
95652af
04a4036
95fbaba
5854e68
5941ef8
169760b
94de1f9
5363042
7d18df7
3c28604
6aaff1b
e6c594b
2044390
5fb5f91
66a149a
ae9745c
1b681c3
647fdfc
c1a11d0
63b899d
fc2f4d4
f9409dd
d53e065
a247ea7
38dc3e3
18e641b
4e35015
9f8d13a
53da697
70be1d0
5ea22af
a46ca4c
502f00f
8a8a4f0
ecb1d70
19e4179
66f5f99
4d640ae
f627ddd
815628c
c714501
d67edf9
8492203
1af8c5a
ca38f1a
dfb938b
4c45604
6c6562d
8db6e92
8e80e98
fe7d607
85ff19c
134288f
991d054
4719841
eedd70f
5f901dd
9238239
6b61a4a
4d976f9
a9786fb
effbe7b
8b0e599
d6a1463
b5dbf14
b3f8aed
9bf5138
1fd847e
911a404
b50e1a8
43075de
0e6b512
67964c0
58ce52a
3429968
2b858d6
ec24907
50ec7c8
bed4f78
5942696
fca40cb
3a3c466
5da91d6
586d02f
3839d99
1170c92
f6853ab
82570f1
1326d5b
80806ea
37e4690
538ab35
3bd95ab
b653d6c
85fd29c
11bede6
b5c719d
544d87c
f2aec96
1fa8a56
de8dd2e
153188c
834bee9
60ff618
f6070f1
802a93a
68e2aa5
7bc9616
5fecd1b
dce35ad
b692edf
7579d83
29829b4
89cf34c
f3deab8
c4e6591
d4a9f70
4bdc295
6296b47
f74cf2c
b910218
b6eb300
19af191
1640350
d0eaf37
12fe02a
a1037c6
40158b3
67cc4c6
a960877
e8ad61a
7af5769
1b4dafc
3490b93
b009b1f
04ea999
a5c70e7
abf3864
598f1c7
73090fd
e2d850d
475be55
2d02ddd
8420b18
742d430
87545a1
df74189
7457f0a
ce5f788
d81d2b6
64a4c6f
05193ca
131da42
12cd792
59cb5f3
836004b
18e41ba
a49f63c
ab2efcb
3b66400
2be73f6
184a151
70826de
995929a
b18a351
b08c03c
1a04748
8930949
be3933e
7f3a979
04d1c4e
6761474
dc11b5b
4a34664
7578997
25032d9
5489bcb
36276e8
d92ce77
521ff12
b941321
fd12996
557c157
4e62c63
6799b8f
30e9b6e
8b046bc
5b7dec6
afe347a
2b8f959
e95d0bc
1abea37
a34bbb6
224adad
8f56969
b1d2568
b6d0e63
3dafb4f
5bdb797
788219a
3a5d269
afbb41c
872c837
e0599a2
39e749e
2cdffc8
86759b3
2718b58
0fef407
7db40c9
835cfd9
2276b54
b76652b
ac67bd5
60d426e
7b21aa7
e0d8f2a
baa1e97
0a4d4d5
de6ba12
a011d36
374c5e0
4ef7868
76660c3
01bcc7d
3855a2c
d4b0afb
ba612d5
b45579b
02ba0eb
4c5f488
7df1e30
bf1c78f
3a867b1
ab7d03c
e1f08b3
d20755c
ee82374
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
- workspaces
- pre-template-literals
- pre-prettier-v3
- pre-prettier
- pre-let-const
- post-workspaces
- post-template-literals
- post-prettier-v3
- post-prettier
- post-let-const
- cesium-workspaces
- 1.124
- 1.123.1
- 1.123
- 1.122
- 1.121.1
- 1.121
- 1.120
- 1.119
- 1.118.2
- 1.118.1
- 1.118
- 1.117
- 1.116
- 1.115
- 1.114
- 1.113
- 1.112
- 1.111
- 1.111-release
- 1.110.1
- 1.110
- 1.109
- 1.108
- 1.107.2
- 1.107.1
- 1.107
- 1.106.1
- 1.106
- 1.105.2
- 1.105.1
- 1.105
- 1.104
- 1.103
- 1.102
- 1.101
- 1.100
- 1.99
- 1.98.1
- 1.98
- 1.97
- 1.96
- 1.95
- 1.94.3
- 1.94.2
- 1.94.1
- 1.94
- 1.93
- 1.92
- 1.91
- 1.90
- 1.89
- 1.88
- 1.87.1
- 1.87
- 1.86.1
- 1.86
- 1.85
- 1.84
- 1.83
- 1.82
- 1.81
- 1.80
- 1.79.1
- 1.79
- 1.78
- 1.77
- 1.76
- 1.75
- 1.74
- 1.73
- 1.72
- 1.71
- 1.70.1
- 1.70
- 1.69
- 1.68
- 1.67
- 1.66
- 1.65
- 1.64
- 1.63.1
- 1.63
- 1.62
- 1.61
- 1.60
- 1.59
- 1.58.1
- 1.58
- 1.57
- 1.56.1
- 1.56
- 1.55
- 1.54
- 1.53
- 1.52
- 1.51
- 1.50
- 1.49
- 1.48
- 1.47
- 1.46
- 1.45
- 1.44
- 1.43
- 1.42.1
- 1.42
- 1.41
- 1.40
- 1.39
- 1.38
- 1.37
- 1.36
- 1.35.2
- 1.35
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,7 +43,6 @@ define([ | |
*/ | ||
function Cesium3DTileFeature(tileset, content, batchId) { | ||
this._content = content; | ||
this._batchTable = content.batchTable; | ||
this._batchId = batchId; | ||
this._color = undefined; // for calling getColor | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I never could come up with a way to remove this when it is not needed. Can you? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Better to have it here in all cases because There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The only way I can think of is having a There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yeap, let's just keep it. |
||
|
||
|
@@ -69,10 +68,10 @@ define([ | |
*/ | ||
show : { | ||
get : function() { | ||
return this._batchTable.getShow(this._batchId); | ||
return this._content.batchTable.getShow(this._batchId); | ||
}, | ||
set : function(value) { | ||
this._batchTable.setShow(this._batchId, value); | ||
this._content.batchTable.setShow(this._batchId, value); | ||
} | ||
}, | ||
|
||
|
@@ -95,10 +94,10 @@ define([ | |
if (!this._color) { | ||
this._color = new Color(); | ||
} | ||
return this._batchTable.getColor(this._batchId, this._color); | ||
return this._content.batchTable.getColor(this._batchId, this._color); | ||
}, | ||
set : function(value) { | ||
this._batchTable.setColor(this._batchId, value); | ||
this._content.batchTable.setColor(this._batchId, value); | ||
} | ||
}, | ||
|
||
|
@@ -131,7 +130,7 @@ define([ | |
* @returns {Boolean} Whether the feature contains this property. | ||
*/ | ||
Cesium3DTileFeature.prototype.hasProperty = function(name) { | ||
return this._batchTable.hasProperty(this._batchId, name); | ||
return this._content.batchTable.hasProperty(this._batchId, name); | ||
}; | ||
|
||
/** | ||
|
@@ -146,7 +145,7 @@ define([ | |
* @returns {String[]} The names of the feature's properties. | ||
*/ | ||
Cesium3DTileFeature.prototype.getPropertyNames = function() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same comment about the |
||
return this._batchTable.getPropertyNames(this._batchId); | ||
return this._content.batchTable.getPropertyNames(this._batchId); | ||
}; | ||
|
||
/** | ||
|
@@ -174,7 +173,7 @@ define([ | |
* @see {Cesium3DTileset#properties} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just It would be worth searching for |
||
*/ | ||
Cesium3DTileFeature.prototype.getProperty = function(name) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does this return a copy, e.g., will a user ever want to modify these values if they are intrinsics or nested objects? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does this and There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It always returns a copy. Is it worth noting that?
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, note it for sure. |
||
return this._batchTable.getProperty(this._batchId, name); | ||
return this._content.batchTable.getProperty(this._batchId, name); | ||
}; | ||
|
||
/** | ||
|
@@ -206,7 +205,7 @@ define([ | |
* @see {Cesium3DTileset#properties} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same comment. |
||
*/ | ||
Cesium3DTileFeature.prototype.setProperty = function(name, value) { | ||
this._batchTable.setProperty(this._batchId, name, value); | ||
this._content.batchTable.setProperty(this._batchId, name, value); | ||
|
||
// PERFORMANCE_IDEA: Probably overkill, but maybe only mark the tile dirty if the | ||
// property is in one of the style's expressions or - if it can be done quickly - | ||
|
@@ -227,7 +226,7 @@ define([ | |
* @private | ||
*/ | ||
Cesium3DTileFeature.prototype.isExactClass = function(className) { | ||
return this._batchTable.isExactClass(this._batchId, className); | ||
return this._content.batchTable.isExactClass(this._batchId, className); | ||
}; | ||
|
||
/** | ||
|
@@ -242,7 +241,7 @@ define([ | |
* @private | ||
*/ | ||
Cesium3DTileFeature.prototype.isClass = function(className) { | ||
return this._batchTable.isClass(this._batchId, className); | ||
return this._content.batchTable.isClass(this._batchId, className); | ||
}; | ||
|
||
/** | ||
|
@@ -256,7 +255,7 @@ define([ | |
* @private | ||
*/ | ||
Cesium3DTileFeature.prototype.getExactClassName = function() { | ||
return this._batchTable.getExactClassName(this._batchId); | ||
return this._content.batchTable.getExactClassName(this._batchId); | ||
}; | ||
|
||
return Cesium3DTileFeature; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The parameters should still be documented and Checked.