edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

[lab] Improve uv scaling

Browse Source
This commit is contained in:
luboslenco
2023-09-20 19:13:24 +02:00
parent 17be988fc6
commit e3a96f41c0
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/Sources/arm/render/RenderPathRaytrace.hx
+3
View File
@@ -119,6 +119,9 @@ class RenderPathRaytrace {
if (!Context.raw.showEnvmap) f32[20] = -f32[20];
f32[21] = Context.raw.envmapAngle;
f32[22] = uvScale;
#if is_lab
f32[22] *= Scene.active.meshes[0].data.scaleTex;
#end
var framebuffer = path.renderTargets.get("buf").image;
Krom.raytraceDispatchRays(framebuffer.renderTarget_, f32.buffer);
base/Sources/arm/ui/TabMeshes.hx
+3 -2
View File
@@ -80,7 +80,8 @@ class TabMeshes {
#end
#if is_lab
var displace_strength = Config.raw.displace_strength > 0 ? Config.raw.displace_strength : 1.0;
MeshUtil.applyDisplacement(arm.logic.BrushOutputNode.inst.texpaint_pack, 0.05 * displace_strength, Context.raw.brushScale);
var uv_scale = iron.Scene.active.meshes[0].data.scaleTex * Context.raw.brushScale;
MeshUtil.applyDisplacement(arm.logic.BrushOutputNode.inst.texpaint_pack, 0.05 * displace_strength, uv_scale);
#end
MeshUtil.calcNormals();
@@ -154,7 +155,7 @@ class TabMeshes {
static function setDefaultMesh(name: String) {
var mo: MeshObject = null;
if (name == ".Plane" || name == ".Sphere") {
var mesh: Dynamic = name == ".Plane" ? new arm.geom.Plane(1, 1, 2048, 2048) : new arm.geom.Sphere(0.9, 2048, 1024, false, 3.0);
var mesh: Dynamic = name == ".Plane" ? new arm.geom.Plane(1, 1, 2048, 2048) : new arm.geom.UVSphere(1.0, 2048, 1024, false, 2.0);
var raw = {
name: "Tessellated",
vertex_arrays: [