Skip to content

Commit 7cb056b

Browse files
committed
Merge branch 'dev-subShader' of github.com:X-OldGentleMan/orillusion into dev-subShader
2 parents 76d30f5 + 83450b6 commit 7cb056b

File tree

2 files changed

+10
-116
lines changed

2 files changed

+10
-116
lines changed

samples/prefab/Sample_Prefab.ts

Lines changed: 0 additions & 113 deletions
This file was deleted.

src/Engine3D.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,14 +355,18 @@ export class Engine3D {
355355
this.renderJobs.set(view, renderJob);
356356
let presentationSize = webGPUContext.presentationSize;
357357
// RTResourceMap.createRTTexture(RTResourceConfig.colorBufferTex_NAME, presentationSize[0], presentationSize[1], GPUTextureFormat.rgba16float, false);
358-
358+
359359
if (this.setting.pick.mode == `pixel`) {
360360
let postProcessing = view.scene.getOrAddComponent(PostProcessingComponent);
361361
postProcessing.addPost(FXAAPost);
362-
view.enablePick = true;
362+
363363
} else {
364364
}
365365

366+
if (this.setting.pick.mode == `pixel` || this.setting.pick.mode == `bound`) {
367+
view.enablePick = true;
368+
}
369+
366370
this.resume();
367371
return renderJob;
368372
}
@@ -383,12 +387,15 @@ export class Engine3D {
383387
let presentationSize = webGPUContext.presentationSize;
384388

385389
if (this.setting.pick.mode == `pixel`) {
386-
view.enablePick = true;
387390
let postProcessing = view.scene.addComponent(PostProcessingComponent);
388391
postProcessing.addPost(FXAAPost);
389392
} else {
390393
RTResourceMap.createRTTexture(RTResourceConfig.colorBufferTex_NAME, presentationSize[0], presentationSize[1], GPUTextureFormat.rgba16float, false);
391394
}
395+
396+
if (this.setting.pick.mode == `pixel` || this.setting.pick.mode == `bound`) {
397+
view.enablePick = true;
398+
}
392399
}
393400
this.resume();
394401
}

0 commit comments

Comments
 (0)