File tree Expand file tree Collapse file tree 3 files changed +668
-593
lines changed Expand file tree Collapse file tree 3 files changed +668
-593
lines changed Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ namespace cage
2020 Real opacity = Real::Nan();
2121 uint32 object = 0 ;
2222 uint32 sceneMask = 1 ;
23+ sint32 layer = 0 ;
2324 };
2425
2526 union CAGE_ENGINE_API ShaderDataComponent
@@ -74,9 +75,10 @@ namespace cage
7475 // real opacity; // todo
7576 uint32 textId = 0 ;
7677 uint32 font = 0 ;
77- uint32 sceneMask = 1 ;
78- Real lineSpacing = 1 ;
7978 TextAlignEnum align = TextAlignEnum::Center;
79+ Real lineSpacing = 1 ;
80+ uint32 sceneMask = 1 ;
81+ sint32 renderLayer = 0 ;
8082 };
8183
8284 struct CAGE_ENGINE_API CameraCommonProperties
Original file line number Diff line number Diff line change @@ -488,6 +488,9 @@ namespace cage
488488
489489 bool intersects (Sphere sphere, const Frustum &frustum)
490490 {
491+ return intersects (Aabb (sphere), frustum);
492+
493+ // the following seems broken
491494 // https://www.flipcode.com/archives/Frustum_Culling.shtml modified
492495 for (int i = 0 ; i < 6 ; i++)
493496 {
You can’t perform that action at this time.
0 commit comments