Skip to content

Commit 2ddd458

Browse files
blakdragan7blakdragan7
andcommitted
feature (Unreal) Ore Support (#12941) eeb280d7f9
* started getting ore to build with unreal * building with ore but not using ore * now subclass context and stub functions * started implementing rhi ore backend * make work with rhi * updated view desc to be rcp for texture * builds in unreal * added asset id flag * started using new internal listener to intercept shader assetts for ore shaders * shaders now apear to compile * formatting * updating to new hlslblob type * pppipelines now potentially setup * all ore is stbbued * revert to master * format * no exceptions on load * re enable canvas draw * reseet back to master * reset to master * updated to use new ore dynamic classes * revert * implemented buffer upload. * started updating to new format * wip * started implementing new rstb * wip ore * wip ore * basics of ore seems to be working * asset cooking started with versioned asstes * run PIE ore nows work * ore working in packaged build for now * shadow maps now working. also added better logging for rhi breadcrumbs * cleaned up logs * ore rhi now works across d3d11-12 nad vulkan * updated to build with master * render targets now draw canvas * console 1 working * hid all console references * builds for xbox ps5 * text * one * two * now works * proper obfuscation * final * platform specific files * compiles for 5.7 * resolve shader * metal now works * fixed open widget in unreal editor * comments cleanup * debug logging * removed dead code, fixed some comments * re worked previous workaround condition to match new way * missing files * fix some compile errors * premake changes * more premake changes * more premgake * wagyu premake * more premake * correct primitive count * set primitive type * fixed pointer issue Co-authored-by: Jonathon Copeland <jcopela4@gmail.com>
1 parent d1bf912 commit 2ddd458

14 files changed

Lines changed: 263 additions & 92 deletions

.rive_head

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e4c22c3ef7ca63dd8ee5d2e4068fae887c7521e1
1+
eeb280d7f906f2e47bb77c02600a301dda7e600d

cg_renderer/src/cg_factory.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,8 @@ AutoCF<CGImageRef> CGRenderer::FlipCGImageInY(AutoCF<CGImageRef> image)
609609
auto w = CGImageGetWidth(image);
610610
auto h = CGImageGetHeight(image);
611611
AutoCF space = CGColorSpaceCreateDeviceRGB();
612-
auto info = kCGBitmapByteOrder32Big | kCGImageAlphaPremultipliedLast;
612+
auto info = static_cast<uint>(kCGBitmapByteOrder32Big) |
613+
static_cast<uint>(kCGImageAlphaPremultipliedLast);
613614
AutoCF ctx = CGBitmapContextCreate(nullptr, w, h, 8, 0, space, info);
614615
CGContextConcatCTM(ctx, CGAffineTransformMake(1, 0, 0, -1, 0, h));
615616
CGContextDrawImage(ctx, CGRectMake(0, 0, w, h), image);

include/rive/assets/shader_asset.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ class ShaderAsset : public ShaderAssetBase
3333
public:
3434
bool decode(SimpleArray<uint8_t>& data, Factory* factory) override
3535
{
36-
return decode(Span<uint8_t>(data.data(), data.size()), factory);
36+
return decode(Span<const uint8_t>(data.data(), data.size()), factory);
3737
}
3838

39-
bool decode(Span<uint8_t> data, Factory* factory);
39+
bool decode(Span<const uint8_t> data, Factory* factory);
4040
std::string fileExtension() const override { return "rstb"; }
4141

4242
/// Returns the blob for the given target, or an empty span if not present.

renderer/premake5.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ if not _OPTIONS['with-webgpu'] then
5050
'rive_harfbuzz',
5151
'rive_sheenbidi',
5252
'rive_yoga',
53+
'luau_vm'
5354
})
5455
filter({ 'options:not no_rive_png' })
5556
do
@@ -100,7 +101,7 @@ if not _OPTIONS['with-webgpu'] then
100101
externalincludedirs({ optick .. '/src'})
101102
end
102103

103-
if rive_target_os == 'windows' then
104+
if rive_target_os == 'windows' and _OPTIONS['for_unreal'] == nil then
104105
externalincludedirs({
105106
dx12_headers .. '/include/directx',
106107
})

0 commit comments

Comments
 (0)