Merge branch 'master' of github.com:hyoo-ru/mam_mol into offline2

.github/workflows/deploy.yml → .github/workflows/mol.yml

@@ -1,4 +1,4 @@
-name: Deploy
+name: $mol
 
 on:
   workflow_dispatch:
@@ -42,12 +42,12 @@ jobs:
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
-    - env:
-        GITHUB_TOKEN: ${{ secrets.GH_PAT }}
-        INPUTS_CLIENT_PAYLOAD: '{"repository":${{ toJson(github.event.repository.name) }}}'
-        INPUTS_EVENT_TYPE: dependency_changed
-        INPUTS_REPOSITORY: ${{ matrix.repo }}
-      uses: rekgrpth/github-repository-dispatch-shell-action@v1
+    - uses: peter-evans/repository-dispatch@v3
+      with:
+        token: ${{ secrets.GH_PAT }}
+        repository: ${{ matrix.repo }}
+        event-type: dependency_changed
+        client-payload: '{"repository":${{ toJson(github.event.repository.name) }}}'
     strategy:
       matrix:
         repo:

3d/sdf/sdf.glsl

@@ -0,0 +1,50 @@
+// min##   = union
+// max##   = joint
+// -#      = inverse
+// #+#     = scale
+
+float mol_3d_sdf_joint( float a, float b ) {
+  return max( a, b );
+}
+float mol_3d_sdf_joint( float a, float b, float c ) {
+  return max( max( a, b ), c );
+}
+float mol_3d_sdf_joint( float a, float b, float c, float d ) {
+  return max( max( a, b ), max( c, d ) );
+}
+float mol_3d_sdf_joint( vec3 point ) {
+  return mol_3d_sdf_joint( point.x, point.y, point.z );
+}
+
+float mol_3d_sdf_union( float a, float b ) {
+  return min( a, b );
+}
+float mol_3d_sdf_union( float a, float b, float c ) {
+  return min( min( a, b ), c );
+}
+float mol_3d_sdf_union( float a, float b, float c, float d ) {
+  return min( min( a, b ), min( c, d ) );
+}
+float mol_3d_sdf_union( vec3 point ) {
+  return mol_3d_sdf_union( point.x, point.y, point.z );
+}
+
+float mol_3d_sdf_union_smooth( float d1, float d2, float k ) {
+    float h = clamp( 0.5 + 0.5*(d2-d1)/k, 0.0, 1.0 );
+    return mix( d2, d1, h ) - k*h*(1.0-h);
+}
+
+float mol_3d_sdf_sphere( vec3 point, float size ) {
+  return length(point) - size;
+}
+
+float mol_3d_sdf_plane( vec3 point, vec3 normal ) {
+  return dot( point, normal );
+}
+
+float mol_3d_sdf_box( vec3 point, vec3 size, float round ) {
+	vec3 d = abs(point) - size + round;
+	return min( mol_3d_sdf_joint( d ), 0.0 )
+		+ length( max( d, 0.0 ) )
+		- round;
+}

base64/decode/decode.node.ts

@@ -1,5 +1,5 @@
 namespace $ {
-	export function $mol_base64_decode_node(base64Str: string): Uint8Array {
+	export function $mol_base64_decode_node(base64Str: string): Uint8Array< ArrayBuffer > {
 
 		base64Str = base64Str.replace( /-/g, '+' ).replace( /_/g, '/' )
 

base64/decode/decode.ts

@@ -1,5 +1,5 @@
 namespace $ {
-	export function $mol_base64_decode(base64: string): Uint8Array {
+	export function $mol_base64_decode(base64: string): Uint8Array< ArrayBuffer > {
 		throw new Error('Not implemented')
 	}
 }

base64/decode/decode.web.ts

@@ -1,6 +1,6 @@
 namespace $ {
 
-	export function $mol_base64_decode_web(base64Str: string): Uint8Array {
+	export function $mol_base64_decode_web(base64Str: string): Uint8Array< ArrayBuffer > {
 		return new Uint8Array($mol_dom_context.atob(base64Str).split('').map(c => c.charCodeAt(0)))
 	}
 

book2/catalog/catalog.view.tree

@@ -25,9 +25,10 @@ $mol_book2_catalog $mol_book2
 				<= Menu_filter $mol_search
 					query? <=> menu_filter? \
 				<= Menu_links $mol_list
+					Empty <= Menu_links_empty $mol_view
 					rows <= menu_links /
 						<= Menu_link*0 $mol_link
-							arg <= arg* *
+							arg <= menu_link_arg* <= arg* *
 							sub <= menu_link_content* /
 								<= Menu_link_title* $mol_dimmer
 									needle <= menu_filter

buffer/buffer.ts

@@ -1,11 +1,11 @@
 namespace $ {
-	export class $mol_buffer extends DataView {
+	export class $mol_buffer extends DataView< ArrayBuffer > {
 
 		static from<
 			This extends typeof $mol_buffer
 		>(
 			this: This,
-			array: number | string | ArrayBufferView,
+			array: number | string | ArrayBufferView< ArrayBuffer >,
 		) {
 			if( typeof array === 'number' ) array = new Uint8Array( array )
 			if( typeof array === 'string' ) array = $mol_base64_ae_decode( array )