Format

armorsculpt/Sources/ImportMesh.ts

@@ -99,8 +99,8 @@ class ImportMesh {
 					let l = Project.layers.pop();
 					SlotLayer.unload(l);
 				}
-				Base.newLayer(false);
-				app_notify_on_init(Base.initLayers);
+				base_newLayer(false);
+				app_notify_on_init(base_initLayers);
 				History.reset();
 			}
 
@@ -118,7 +118,7 @@ class ImportMesh {
 			// Wait for addMesh calls to finish
 			app_notify_on_init(ImportMesh.finishImport);
 
-			Base.notifyOnNextFrame(() => {
+			base_notifyOnNextFrame(() => {
 				let f32 = new Float32Array(Config.getTextureResX() * Config.getTextureResY() * 4);
 				for (let i = 0; i < Math.floor(mesh.inda.length); ++i) {
 					let index = mesh.inda[i];
@@ -130,7 +130,7 @@ class ImportMesh {
 				let imgmesh = image_from_bytes(f32.buffer, Config.getTextureResX(), Config.getTextureResY(), tex_format_t.RGBA128);
 				let texpaint = Project.layers[0].texpaint;
 				g2_begin(texpaint);
-				g2_set_pipeline(Base.pipeCopy128);
+				g2_set_pipeline(base_pipeCopy128);
 				g2_draw_scaled_image(imgmesh, 0, 0, Config.getTextureResX(), Config.getTextureResY());
 				g2_set_pipeline(null);
 				g2_end();

armorsculpt/Sources/MakeMaterial.ts

@@ -229,7 +229,7 @@ class MakeMaterial {
 		for (let key of Context.raw.nodePreviews.keys()) {
 			if (Context.raw.nodePreviewsUsed.indexOf(key) == -1) {
 				let image = Context.raw.nodePreviews.get(key);
-				Base.notifyOnNextFrame(function() { image_unload(image); });
+				base_notifyOnNextFrame(function() { image_unload(image); });
 				Context.raw.nodePreviews.delete(key);
 			}
 		}
@@ -317,7 +317,7 @@ class MakeMaterial {
 	}
 
 	static deleteContext = (c: shader_context_t) => {
-		Base.notifyOnNextFrame(() => { // Ensure pipeline is no longer in use
+		base_notifyOnNextFrame(() => { // Ensure pipeline is no longer in use
 			shader_context_delete(c);
 		});
 	}

armorsculpt/Sources/TabLayers.ts

@@ -75,7 +75,7 @@ class TabLayers {
 			UIMenu.draw((ui: zui_t) => {
 				let l = Context.raw.layer;
 				if (UIMenu.menu_button(ui, tr("Paint Layer"))) {
-					Base.new_layer();
+					base_base_new_layer();
 					History.new_layer();
 				}
 			}, 1);
@@ -114,9 +114,9 @@ class TabLayers {
 	}
 
 	static setDragLayer = (layer: SlotLayerRaw, offX: f32, offY: f32) => {
-		Base.drag_off_x = offX;
-		Base.drag_off_y = offY;
-		Base.drag_layer = layer;
+		base_base_drag_off_x = offX;
+		base_base_drag_off_y = offY;
+		base_base_drag_layer = layer;
 		Context.raw.drag_dest = Project.layers.indexOf(layer);
 	}
 
@@ -141,15 +141,15 @@ class TabLayers {
 
 		// Highlight drag destination
 		let absy = ui._window_y + ui._y;
-		if (Base.is_dragging && Base.drag_layer != null && Context.in_layers()) {
+		if (base_base_is_dragging && base_base_drag_layer != null && Context.in_layers()) {
 			if (mouse_y > absy + step && mouse_y < absy + step * 3) {
-				let down = Project.layers.indexOf(Base.drag_layer) >= i;
+				let down = Project.layers.indexOf(base_base_drag_layer) >= i;
 				Context.raw.drag_dest = down ? i : i - 1;
 
 				let ls = Project.layers;
 				let dest = Context.raw.drag_dest;
 				let toGroup = down ? dest > 0 && ls[dest - 1].parent != null && ls[dest - 1].parent.show_panel : dest < ls.length && ls[dest].parent != null && ls[dest].parent.show_panel;
-				let nestedGroup = SlotLayer.is_group(Base.drag_layer) && toGroup;
+				let nestedGroup = SlotLayer.is_group(base_base_drag_layer) && toGroup;
 				if (!nestedGroup) {
 					if (SlotLayer.can_move(Context.raw.layer, Context.raw.drag_dest)) {
 						zui_fill(checkw, step * 2, (ui._window_w / zui_SCALE(ui) - 2) - checkw, 2 * zui_SCALE(ui), ui.t.HIGHLIGHT_COL);
@@ -163,7 +163,7 @@ class TabLayers {
 				}
 			}
 		}
-		if (Base.is_dragging && (Base.drag_material != null || Base.drag_swatch != null) && Context.in_layers()) {
+		if (base_base_is_dragging && (base_base_drag_material != null || base_base_drag_swatch != null) && Context.in_layers()) {
 			if (mouse_y > absy + step && mouse_y < absy + step * 3) {
 				Context.raw.drag_dest = i;
 				if (TabLayers.can_drop_new_layer(i))
@@ -338,8 +338,8 @@ class TabLayers {
 	static comboObject = (ui: zui_t, l: SlotLayerRaw, label = false): zui_handle_t => {
 		let ar = [tr("Shared")];
 		let objectHandle = zui_nest(zui_handle("tablayers_2"), l.id);
-		objectHandle.position = l.objectMask;
-		l.objectMask = zui_combo(objectHandle, ar, tr("Object"), label, zui_align_t.LEFT);
+		objectHandle.position = l.object_mask;
+		l.object_mask = zui_combo(objectHandle, ar, tr("Object"), label, zui_align_t.LEFT);
 		return objectHandle;
 	}
 

armorsculpt/Sources/nodes/BrushOutputNode.ts

@@ -75,7 +75,7 @@ class BrushOutputNode extends LogicNode {
 		let right = 1.0;
 		if (Context.raw.paint2d) {
 			left = 1.0;
-			right = (Context.raw.splitView ? 2.0 : 1.0) + UIView2D.ww / Base.w();
+			right = (Context.raw.splitView ? 2.0 : 1.0) + UIView2D.ww / base_w();
 		}
 
 		// First time init
@@ -99,10 +99,10 @@ class BrushOutputNode extends LogicNode {
 			!groupLayer &&
 			(SlotLayer.isVisible(Context.raw.layer) || Context.raw.paint2d) &&
 			!UIBase.ui.is_hovered &&
-			!Base.isDragging &&
-			!Base.isResizing &&
-			!Base.isScrolling() &&
-			!Base.isComboSelected()) {
+			!base_isDragging &&
+			!base_isResizing &&
+			!base_isScrolling() &&
+			!base_isComboSelected()) {
 
 			let down = mouse_down() || pen_down();