maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update shader load

Browse source
This commit is contained in:
luboslenco 2019-04-15 13:47:51 +02:00
parent a8961dcb4e
commit d4680b5e1a
1 changed files with 43 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Sources/armory/renderpath/RenderPathRaytracer.hx
View file

@ -37,10 +37,7 @@ class RenderPathRaytracer {
public static function init(_path:RenderPath) {
path = _path;
kha.Assets.loadBlobFromPath("pt_raygeneration.o", function(rayShader:kha.Blob) {
kha.Assets.loadBlobFromPath("pt_closesthit.o", function(hitShader:kha.Blob) {
kha.Assets.loadBlobFromPath("pt_miss.o", function(missShader:kha.Blob) {
kha.Assets.loadBlobFromPath("raytrace.cso", function(rayTraceShader:kha.Blob) {
ready = true;
// Command list
@ -53,7 +50,7 @@ class RenderPathRaytracer {
// Pipeline
constantBuffer = new ConstantBuffer(21 * 4);
pipeline = new RayTracePipeline(commandList, rayShader, hitShader, missShader, constantBuffer);
pipeline = new RayTracePipeline(commandList, rayTraceShader, constantBuffer);
// Acceleration structure
var structure = new VertexStructure();
@ -89,8 +86,6 @@ class RenderPathRaytracer {
// Output
target = new RayTraceTarget(iron.App.w(), iron.App.h());
});
});
});
}
public static function commands() {