Added ignored files.

.gitignore

@@ -21,8 +21,6 @@ __MANPAGES__/
 /tmp/*
 !/tmp/.gitignore
 
-**/assets/mojo
-
 /modules/module-manager/downloads/*.zip
 
 Monkey2 (Windows).exe

bananas/commanche/assets/mojo/shader_font.glsl

@@ -0,0 +1,31 @@
+
+// ***** alpha surface shader *****
+
+varying vec4 Color;
+
+varying vec2 TexCoord0;
+
+//@vertex
+
+void transform( out vec4 viewpos ){
+
+	viewpos=mx2_ModelViewMatrix * mx2_VertexPosition;
+	
+	Color=mx2_VertexColor * mx2_RenderColor;
+	
+	TexCoord0=mx2_VertexTexCoord0;
+}
+
+//@fragment
+
+uniform sampler2D u_Texture0;
+
+void ambientPass( out vec4 ambient ){
+
+	ambient=vec4( texture2D( u_Texture0,TexCoord0 ).a ) * Color;
+}
+
+void lightingPass( out vec4 diffuse,out vec4 specular,out vec3 normal ){
+
+}
+

bananas/commanche/assets/mojo/shader_null.glsl

@@ -0,0 +1,25 @@
+
+// ***** alpha surface shader *****
+
+varying vec4 Color;
+
+//@vertex
+
+void transform( out vec4 viewpos ){
+
+	viewpos=mx2_ModelViewMatrix * mx2_VertexPosition;
+	
+	Color=mx2_VertexColor * mx2_RenderColor;
+}
+
+//@fragment
+
+void ambientPass( out vec4 ambient ){
+
+	ambient=Color;
+}
+
+void lightingPass( out vec4 diffuse,out vec4 specular,out vec3 normal ){
+
+}
+

bananas/commanche/assets/mojo/shader_sprite.glsl

@@ -0,0 +1,31 @@
+
+// ***** matte surface shader *****
+
+varying vec4 Color;
+
+varying vec2 TexCoord0;
+
+//@vertex
+
+void transform( out vec4 viewpos ){
+
+	viewpos=mx2_ModelViewMatrix * mx2_VertexPosition;
+	
+	Color=mx2_VertexColor * mx2_RenderColor;
+	
+	TexCoord0=mx2_VertexTexCoord0;
+}
+
+//@fragment
+
+uniform sampler2D u_Texture0;
+
+void ambientPass( out vec4 ambient ){
+
+	ambient=texture2D( u_Texture0,TexCoord0 ) * Color;
+}
+
+void lightingPass( out vec4 diffuse,out vec4 specular,out vec3 normal ){
+
+}
+

bananas/commanche/assets/mojo/shaderenv_ambient.glsl

@@ -0,0 +1,38 @@
+
+// ***** ambient shaderenv *****
+
+uniform mat4 mx2_ModelViewMatrix;
+uniform mat4 mx2_ProjectionMatrix;
+uniform vec4 mx2_AmbientLight;
+uniform vec4 mx2_RenderColor;
+
+//@vertex
+
+attribute vec4 mx2_VertexPosition;
+attribute vec2 mx2_VertexTexCoord0;
+attribute vec2 mx2_VertexTangent;
+attribute vec4 mx2_VertexColor;
+
+void transform( out vec4 viewpos );
+
+void main(){
+
+	vec4 position;
+	
+	transform( position );
+	
+	gl_Position=mx2_ProjectionMatrix * position;
+}
+
+//@fragment
+
+void ambientPass( out vec4 ambient );
+
+void main(){
+
+	vec4 ambient;
+	
+	ambientPass( ambient );
+	
+	gl_FragColor=ambient;
+}

modules/mojo/assets/mojo/shader_env.glsl

@@ -0,0 +1,127 @@
+
+// One of these defined!
+
+//#define RENDERPASS_AMBIENT
+
+//#define RENDERPASS_NORMAL
+
+//#define RENDERPASS_LIGHT
+
+uniform mat4 mx2_ModelViewMatrix;
+uniform mat4 mx2_ProjectionMatrix;
+uniform vec4 mx2_AmbientLight;
+uniform vec4 mx2_RenderColor;
+
+varying vec4 mx2_ViewPosition;
+varying vec4 mx2_Color;
+
+#if defined( RENDERPASS_LIGHT )
+varying vec2 mx2_FragPos;
+#endif
+
+//@vertex
+
+attribute vec4 mx2_VertexPosition;
+attribute vec2 mx2_VertexTexCoord0;
+attribute vec2 mx2_VertexTangent;
+attribute vec4 mx2_VertexColor;
+
+void transform( out vec4 viewpos );
+
+void main(){
+
+	vec4 position;
+	
+	transform( position );
+	
+	mx2_ViewPosition=position;
+	mx2_Color=mx2_RenderColor * mx2_VertexColor;
+	
+	gl_Position=mx2_ProjectionMatrix * position;
+	
+#if defined( RENDERPASS_LIGHT )
+	mx2_FragPos=gl_Position;
+#endif
+}
+
+//@fragment
+
+#if defined( RENDERPASS_LIGHT )
+
+uniform vec4 mx2_LightVector;
+uniform vec4 mx2_LightColor;
+uniform sampler2D mx2_NormalTexture;
+
+#endif
+
+void lighting( out vec4 diffuse,out vec4 specular,out vec4 emissive,out vec3 normal,out float alpha );
+
+void main(){
+
+	vec4 diffuse,specular,emissive;
+	vec3 normal;
+	float alpha;
+	
+	lighting( diffuse,specular,emissive,normal,alpha );
+
+#if defined( RENDERPASS_AMBIENT )
+
+	vec4 color=diffuse * mx2_AmbientLight + emissive;
+	
+	gl_FragColor=vec4( color.rgb,alpha ) * mx2_Color;
+	
+#elif defined( RENDERPASS_NORMAL )
+
+	//write out normal + specular component
+	//
+	gl_FragColor=vec4( normal * alpha,specular.w );
+	
+#elif defined( RENDERPASS_LIGHT )
+
+	vec4 npass=texture2D( mx2_PassTexture,mx2_FragPos );
+	
+	//grab normal
+	vec3 normal=npass.xyz;
+
+	//specular power
+	float gloss=npass.w;
+	float spow=pow( 2.0,gloss*12.0 );
+	float fnorm=(spow+8.0)/25.1327412287;		//	(n+8)/8*pi apparently for blinn-phong...
+
+	//normalized vector to eye	
+	
+	vec3 v=mx2_LightVector.xyz-mx2_ViewPosition.xyz;
+	float falloff=max( 1.0-length( v )/mx2_LightVector.w,0.0 );
+	
+	vec3 lvec=normalize( v );
+	vec3 evec=normalize( -mx2_ViewPosition.xyz );
+	vec3 hvec=normalize( lvec + evec );
+	
+	float ndotv=max( dot( normal,evec ),0.0 );
+	float ndotl=max( dot( normal,lvec ),0.0 );
+	float ndoth=max( dot( normal,hvec ),0.0 );
+	
+	float i=ndtol * falloff;
+	
+	vec3 diff=mx2_LightColor.rgb * i;
+	float spec=mx2_LightColor.w * i * pow( ndoth,spow ) * fnorm;
+	
+	//frenel-ish?
+	spec+=(1.0-spec) * pow( 1.0-ndotv,5.0 ) * gloss;
+	
+	//write diffuse + specular
+	gl_FragColor=vec4( diff,spec );
+	
+#elif defined( RENDERPASS_LIGHT2 )
+
+	vec4 intex=texture2D( mx2_PassTexture,mx2_FragPos );
+	
+	diffuse=diffuse * mx2_AmbientLight + (diffuse * intex.rgb) + emissive;
+	
+	specular=specular * intex.w;
+	
+	gl_FragColor=vec4( (diffuse+specular).rgb,alpha );
+	
+#endif
+
+}

modules/mojo/assets/mojo/shader_font.glsl

@@ -0,0 +1,24 @@
+
+// ***** alpha surface shader *****
+
+varying vec2 TexCoord0;
+
+//@vertex
+
+void transform( out vec4 viewpos ){
+
+	viewpos=mx2_ModelViewMatrix * mx2_VertexPosition;
+	
+	TexCoord0=mx2_VertexTexCoord0;
+}
+
+//@fragment
+
+uniform sampler2D DiffuseTexture;
+
+void lighting( out vec4 diffuse,out vec4 specular,out vec4 emissive,out vec3 normal,out float alpha ){
+
+	emissive=vec4( texture2D( DiffuseTexture,TexCoord0 ).a );
+	
+	alpha=emissive.a;
+}

modules/mojo/assets/mojo/shader_matte.glsl

@@ -0,0 +1,28 @@
+
+// ***** matte surface shader *****
+
+varying vec2 texCoord0;
+
+//@vertex
+
+void transform( out vec4 viewpos ){
+
+	viewpos=mx2_ModelViewMatrix * mx2_Vertex;
+
+	texCoord0=mx2_TexCoord0;
+}
+
+//@fragment
+
+uniform sampler2D ColorTexture;		//default=white
+uniform sampler2D SpecularTexture;	//default=black
+uniform sampler2D NormalTexture;	//default=black
+
+void ambientPass( out vec4 ambient ){
+	
+	ambient=texture2D( ColorTexture,texCoord0 ) * mx2_AmbientLight;
+}
+
+void lightingPass( out vec4 diffuse,out vec4 specular,out vec4 normal ){
+
+}

modules/mojo/assets/mojo/shader_null.glsl

@@ -0,0 +1,20 @@
+
+// ***** alpha surface shader *****
+
+//@vertex
+
+void transform( out vec4 viewpos ){
+
+	viewpos=mx2_ModelViewMatrix * mx2_VertexPosition;
+
+	gl_PointSize=1.0;
+}
+
+//@fragment
+
+void lighting( out vec4 diffuse,out vec4 specular,out vec4 emissive,out vec3 normal,out float alpha ){
+
+	emissive=vec4( 1.0 );
+	
+	alpha=1.0;
+}

modules/mojo/assets/mojo/shader_phong.glsl

@@ -0,0 +1,30 @@
+
+// ***** phong surface shader *****
+
+varying vec2 TexCoord0;
+
+//@vertex
+
+void transform( out vec4 viewpos ){
+
+	viewpos=mx2_ModelViewMatrix * mx2_VertexPosition;
+	
+	TexCoord0=mx2_VertexTexCoord0;
+}
+
+//@fragment
+
+uniform sampler2D DiffuseTexture;
+uniform sampler2D SpecularTexture;
+uniform sampler2D NormalTexture;
+
+void lighting( out vec4 diffuse,out vec4 specular,out vec4 emissive,out vec3 normal,out float alpha ){
+
+	diffuse=texture2D( DiffuseTexture,TexCoord0 );
+	
+	specular=texture2D( SpecularTexture,TexCoord0 );
+	
+	normal=normalize( mat3( mx2_ModelViewMatrix ) * texture2D( NormalTexture,TexCoord0 ).xyz );
+	
+	alpha=diffuse.a;
+}

modules/mojo/assets/mojo/shader_sprite.glsl

@@ -0,0 +1,24 @@
+
+// ***** sprite surface shader *****
+
+varying vec2 TexCoord0;
+
+//@vertex
+
+void transform( out vec4 viewpos ){
+
+	viewpos=mx2_ModelViewMatrix * mx2_VertexPosition;
+	
+	TexCoord0=mx2_VertexTexCoord0;
+}
+
+//@fragment
+
+uniform sampler2D DiffuseTexture;
+
+void lighting( out vec4 diffuse,out vec4 specular,out vec4 emissive,out vec3 normal,out float alpha ){
+
+	emissive=texture2D( DiffuseTexture,TexCoord0 );
+	
+	alpha=emissive.a;
+}

modules/mojox/assets/mojox/filetype_icons/filetypes.txt

@@ -1,63 +0,0 @@
-_dir.png
-_file.png
-aac.png
-ai.png
-aiff.png
-avi.png
-bmp.png
-c.png
-cpp.png
-css.png
-dat.png
-dmg.png
-doc.png
-dotx.png
-dwg.png
-dxf.png
-eps.png
-exe.png
-flv.png
-gif.png
-h.png
-hpp.png
-html.png
-ics.png
-iso.png
-java.png
-jpg.png
-js.png
-key.png
-less.png
-mid.png
-mp3.png
-mp4.png
-mpg.png
-odf.png
-ods.png
-odt.png
-otp.png
-ots.png
-ott.png
-pdf.png
-php.png
-png.png
-ppt.png
-psd.png
-py.png
-qt.png
-rar.png
-rb.png
-rtf.png
-sass.png
-scss.png
-sql.png
-tga.png
-tgz.png
-tiff.png
-txt.png
-wav.png
-xls.png
-xlsx.png
-xml.png
-yml.png
-zip.png

modules/mojox/assets/mojox/htmlview_master_css.css

@@ -1,327 +0,0 @@
-html {
-    display: block;
-    height:100%;
-    width:100%;
-	position: relative;
-}
-
-head {
-    display: none
-}
-
-meta {
-    display: none
-}
-
-title {
-    display: none
-}
-
-link {
-    display: none
-}
-
-style {
-    display: none
-}
-
-script {
-    display: none
-}
-
-body {
-	display:block; 
-/*	margin:8px; */
-    height:100%;
-    width:100%;
-}
-
-p {
-	display:block; 
-	margin-top:1em; 
-	margin-bottom:1em;
-}
-
-b, strong {
-	display:inline; 
-	font-weight:bold;
-}
-
-i, em {
-	display:inline; 
-	font-style:italic;
-}
-
-center 
-{
-	text-align:center;
-	display:block;
-}
-
-a:link
-{
-	text-decoration: underline;
-	color: #00f;
-	cursor: pointer;
-}
-
-h1, h2, h3, h4, h5, h6, div {
-	display:block;
-}
-
-h1 {
-	font-weight:bold; 
-	margin-top:0.67em; 
-	margin-bottom:0.67em; 
-	font-size: 2em;
-}
-
-h2 {
-	font-weight:bold; 
-	margin-top:0.83em; 
-	margin-bottom:0.83em; 
-	font-size: 1.5em;
-}
-
-h3 {
-	font-weight:bold; 
-	margin-top:1em; 
-	margin-bottom:1em; 
-	font-size:1.17em;
-}
-
-h4 {
-	font-weight:bold; 
-	margin-top:1.33em; 
-	margin-bottom:1.33em
-}
-
-h5 {
-	font-weight:bold; 
-	margin-top:1.67em; 
-	margin-bottom:1.67em;
-	font-size:.83em;
-}
-
-h6 {
-	font-weight:bold; 
-	margin-top:2.33em; 
-	margin-bottom:2.33em;
-	font-size:.67em;
-} 
-
-br {
-	display:inline-block;
-}
-
-br[clear="all"]
-{
-	clear:both;
-}
-
-br[clear="left"]
-{
-	clear:left;
-}
-
-br[clear="right"]
-{
-	clear:right;
-}
-
-span {
-	display:inline
-}
-
-img {
-	display: inline-block;
-}
-
-img[align="right"]
-{
-	float: right;
-}
-
-img[align="left"]
-{
-	float: left;
-}
-
-hr {
-    display: block;
-    margin-top: 0.5em;
-    margin-bottom: 0.5em;
-    margin-left: auto;
-    margin-right: auto;
-    border-style: inset;
-    border-width: 1px
-}
-
-
-/***************** TABLES ********************/
-
-table {
-    display: table;
-    border-style: solid;
-    border-collapse: separate;
-    border-spacing: 2px;
-    border-top-color:gray;
-    border-left-color:gray;
-    border-bottom-color:black;
-    border-right-color:black;
-}
-
-tbody, tfoot, thead {
-	display:table-row-group;
-	vertical-align:middle;
-}
-
-tr {
-    display: table-row;
-    vertical-align: inherit;
-    border-color: inherit;
-}
-
-td, th {
-    display: table-cell;
-    vertical-align: inherit;
-    border-width:1px;
-    padding:1px;
-}
-
-th {
-	font-weight: bold;
-}
-
-table[border] {
-    border-style:solid;
-}
-
-table[border|=0] {
-    border-style:none;
-}
-
-table[border] td, table[border] th {
-    border-style:solid;
-    border-top-color:black;
-    border-left-color:black;
-    border-bottom-color:gray;
-    border-right-color:gray;
-}
-
-table[border|=0] td, table[border|=0] th {
-    border-style:none;
-}
-
-caption {
-	display: table-caption;
-}
-
-td[nowrap], th[nowrap] {
-	white-space:nowrap;
-}
-
-tt, code, kbd, samp {
-    font-family: monospace
-}
-
-pre, xmp, plaintext, listing {
-    display: block;
-    font-family: monospace;
-    white-space: pre;
-    margin: 1em 0
-}
-
-/***************** LISTS ********************/
-
-ul, menu, dir {
-    display: block;
-    list-style-type: disc;
-    margin-top: 0;
-    margin-bottom: 0;
-    margin-left: 0;
-    margin-right: 0;
-    padding-left: 40px
-}
-
-ol {
-    display: block;
-    list-style-type: decimal;
-    margin-top: 0;
-    margin-bottom: 0;
-    margin-left: 0;
-    margin-right: 0;
-    padding-left: 40px
-}
-
-li {
-    display: list-item;
-}
-
-ul ul, ol ul {
-    list-style-type: circle;
-}
-
-ol ol ul, ol ul ul, ul ol ul, ul ul ul {
-    list-style-type: square;
-}
-
-dd {
-    display: block;
-    margin-left: 40px;
-}
-
-dl {
-    display: block;
-    margin-top: 1em;
-    margin-bottom: 1em;
-    margin-left: 0;
-    margin-right: 0;
-}
-
-dt {
-    display: block;
-}
-
-ol ul, ul ol, ul ul, ol ol {
-    margin-top: 0;
-    margin-bottom: 0
-}
-
-blockquote {
-	display: block;
-	margin-top: 1em;
-	margin-bottom: 1em;
-	margin-left: 40px;
-	margin-left: 40px;
-}
-
-/*********** FORM ELEMENTS ************/
-
-form {
-	display: block;
-	margin-top: 0em;
-}
-
-option {
-	display: none;
-}
-
-input, textarea, keygen, select, button, isindex {
-	margin: 0em;
-	color: initial;
-	line-height: normal;
-	text-transform: none;
-	text-indent: 0;
-	text-shadow: none;
-	display: inline-block;
-}
-input[type="hidden"] {
-	display: none;
-}
-
-
-article, aside, footer, header, hgroup, nav, section 
-{
-	display: block;
-}

modules/mojox/assets/mojox/markdown_wrapper.html

@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-
-<head>
-
-<style>
-
-body{
-	background: #888;
-	color: #fff;
-}
-
-</style>
-
-</head>
-
-<html>
-
-<body>
-
-${CONTENT}
-
-</body>
-
-</html>

modules/mojox/assets/themes/htmlview_master_css.css

@@ -31,7 +31,7 @@ script {
 
 body {
 	display:block; 
-	margin:8px; 
+/*	margin:8px; */
     height:100%;
     width:100%;
 }
@@ -237,8 +237,8 @@ pre, xmp, plaintext, listing {
 ul, menu, dir {
     display: block;
     list-style-type: disc;
-    margin-top: 1em;
-    margin-bottom: 1em;
+    margin-top: 0;
+    margin-bottom: 0;
     margin-left: 0;
     margin-right: 0;
     padding-left: 40px
@@ -247,8 +247,8 @@ ul, menu, dir {
 ol {
     display: block;
     list-style-type: decimal;
-    margin-top: 1em;
-    margin-bottom: 1em;
+    margin-top: 0;
+    margin-bottom: 0;
     margin-left: 0;
     margin-right: 0;
     padding-left: 40px

modules/mojox/htmlview.monkey2

@@ -17,7 +17,7 @@ Class HtmlView Extends ScrollableView
 		Style=GetStyle( "HtmlView" )
 		
 		_context=New litehtml.context
-		_context.load_master_stylesheet( stringio.LoadString( "asset::mojox/htmlview_master_css.css" ) )
+		_context.load_master_stylesheet( stringio.LoadString( "theme::htmlview_master_css.css" ) )
 
 		_container=New document_container( Self )
 		
@@ -73,7 +73,7 @@ Class HtmlView Extends ScrollableView
 		
 		If ExtractExt( url )=".md"
 			src=hoedown.MarkdownToHtml( src )
-			Local wrapper:=stringio.LoadString( "asset::mojox/markdown_wrapper.html" )
+			Local wrapper:=stringio.LoadString( "theme::markdown_wrapper.html" )
 			src=wrapper.Replace( "${CONTENT}",src )
 		End
 		

tmp/.gitignore

@@ -1 +0,0 @@
-!.gitignore