Browse Source

renamed top level directories

master
Inderjit Gill 8 months ago
parent
commit
b00389974d
100 changed files with 24 additions and 44 deletions
  1. +0
    -21
      .gitignore
  2. +0
    -0
      cli/.gitignore
  3. +2
    -2
      cli/Cargo.toml
  4. +0
    -0
      cli/pp.seni
  5. +0
    -0
      cli/prng-bug.seni
  6. +5
    -5
      cli/src/main.rs
  7. +0
    -0
      client/.gitignore
  8. +2
    -2
      client/Cargo.toml
  9. +2
    -2
      client/build.bat
  10. +2
    -2
      client/build.sh
  11. +1
    -1
      client/sed-hack.sh
  12. +2
    -2
      client/src/lib.rs
  13. +0
    -0
      client/src/utils.rs
  14. +2
    -0
      client/www/.gitignore
  15. +0
    -0
      client/www/css/bones.css
  16. +0
    -0
      client/www/css/indyio.css
  17. +0
    -0
      client/www/css/stylesheet.css
  18. +0
    -0
      client/www/favicon.ico
  19. +0
    -0
      client/www/img/seni/14ef-blur-grid.png
  20. +0
    -0
      client/www/img/seni/14eg-marker-grid.png
  21. +0
    -0
      client/www/img/seni/14eh-chaotic-grid.png
  22. +0
    -0
      client/www/img/seni/14fh-rothko-1.png
  23. +0
    -0
      client/www/img/seni/151c-flower.png
  24. +0
    -0
      client/www/img/seni/1531-four-squares.png
  25. +0
    -0
      client/www/img/seni/154c-stroked-bezier.png
  26. +0
    -0
      client/www/img/seni/154h-rothko-2.png
  27. +0
    -0
      client/www/img/seni/1556-biomorphs.png
  28. +0
    -0
      client/www/img/seni/155b-spiral-derived.png
  29. +0
    -0
      client/www/img/seni/155j-chaotic-grid-2.png
  30. +0
    -0
      client/www/img/seni/155j-chaotic-grid-3.png
  31. +0
    -0
      client/www/img/seni/1560-path.png
  32. +0
    -0
      client/www/img/seni/1565-hex-grid.png
  33. +0
    -0
      client/www/img/seni/156h-tri-grid.png
  34. +0
    -0
      client/www/img/seni/157e-tile-shadow.png
  35. +0
    -0
      client/www/img/seni/1580-quilt.png
  36. +0
    -0
      client/www/img/seni/1585-seeds.png
  37. +0
    -0
      client/www/img/seni/15fe-rotate-mirror.png
  38. +0
    -0
      client/www/img/seni/15h3-polychrome.png
  39. +0
    -0
      client/www/img/seni/15h3-rotate-mirror-2.png
  40. +0
    -0
      client/www/img/seni/15h3-tri-grid.png
  41. +0
    -0
      client/www/img/seni/15h4-chromatic-layers-1.png
  42. +0
    -0
      client/www/img/seni/15h4-chromatic-layers-2.png
  43. +0
    -0
      client/www/img/seni/15h4-chromatic-layers-3.png
  44. +0
    -0
      client/www/img/seni/15h4-mirror-layers.png
  45. +0
    -0
      client/www/img/seni/15h4-rotate-mirror.png
  46. +0
    -0
      client/www/img/seni/15he-cos-1.png
  47. +0
    -0
      client/www/img/seni/15he-cos-2.png
  48. +0
    -0
      client/www/img/seni/15he-cos-3.png
  49. +0
    -0
      client/www/img/seni/15he-mirror-layers.png
  50. +0
    -0
      client/www/img/seni/15he-rotate-mirror.png
  51. +0
    -0
      client/www/img/seni/160c-schotter.png
  52. +0
    -0
      client/www/img/seni/161g-grid-flow.png
  53. +0
    -0
      client/www/img/seni/161j-trump.png
  54. +0
    -0
      client/www/img/seni/1626-embers.png
  55. +0
    -0
      client/www/img/seni/1626-orchid.png
  56. +0
    -0
      client/www/img/seni/162e-alien.png
  57. +0
    -0
      client/www/img/seni/162e-mask.png
  58. +0
    -0
      client/www/img/seni/162e-slice.png
  59. +0
    -0
      client/www/img/seni/162e-star.png
  60. +0
    -0
      client/www/img/seni/162e-x.png
  61. +0
    -0
      client/www/img/seni/1632-star.png
  62. +0
    -0
      client/www/img/seni/1633-dune.png
  63. +0
    -0
      client/www/img/seni/1633-orchid.png
  64. +0
    -0
      client/www/img/seni/1633-petal.png
  65. +0
    -0
      client/www/img/seni/1634-cryst.png
  66. +0
    -0
      client/www/img/seni/1638-night.png
  67. +0
    -0
      client/www/img/seni/163a-scale-green.png
  68. +0
    -0
      client/www/img/seni/1642-book-stack.png
  69. +0
    -0
      client/www/img/seni/1642-stacks.png
  70. +0
    -0
      client/www/img/seni/1643-hyp.png
  71. +0
    -0
      client/www/img/seni/1643-paren.png
  72. +0
    -0
      client/www/img/seni/1643-rose.png
  73. +0
    -0
      client/www/img/seni/1643-thorn.png
  74. +0
    -0
      client/www/img/seni/1648-chalk-boxes.png
  75. +0
    -0
      client/www/img/seni/1743-dragon.png
  76. +0
    -0
      client/www/img/seni/1743-grose.png
  77. +0
    -0
      client/www/img/seni/1743-segs.png
  78. +0
    -0
      client/www/img/seni/1743-shell.png
  79. +0
    -0
      client/www/img/seni/1748-orchid-b.png
  80. +0
    -0
      client/www/img/seni/1840-boxes.png
  81. +0
    -0
      client/www/img/seni/1841-nib.png
  82. +0
    -0
      client/www/img/seni/blank.png
  83. +0
    -0
      client/www/img/spinner.gif
  84. +0
    -0
      client/www/img/texture.png
  85. +1
    -1
      client/www/index.html
  86. +0
    -0
      client/www/index.js
  87. +0
    -0
      client/www/lib/codemirror/LICENSE
  88. +0
    -0
      client/www/lib/codemirror/closebrackets.js
  89. +0
    -0
      client/www/lib/codemirror/codemirror.css
  90. +0
    -0
      client/www/lib/codemirror/codemirror.js
  91. +0
    -0
      client/www/lib/codemirror/matchbrackets.js
  92. +0
    -0
      client/www/piece.html
  93. +0
    -0
      client/www/sw.js
  94. +4
    -5
      client/www/worker.js
  95. +0
    -0
      core/.gitignore
  96. +1
    -1
      core/Cargo.toml
  97. +0
    -0
      core/src/colour.rs
  98. +0
    -0
      core/src/compiler.rs
  99. +0
    -0
      core/src/ease.rs
  100. +0
    -0
      core/src/error.rs

+ 0
- 21
.gitignore View File

@@ -1,17 +1,5 @@
serve
serve.exe
seni-server
seni-server.exe

.DS_Store

/.vs

/client/www/dist
/client/www/app

/server/target

# Logs
logs
*.log
@@ -20,12 +8,3 @@ logs
pids
*.pid
*.seed

# Dependency directory
/core/node_modules
/core/test
/core/test.exe
/client/node_modules
/client/www/node_modules
coverage
tmp

sen-client/.gitignore → cli/.gitignore View File


sen-native/Cargo.toml → cli/Cargo.toml View File

@@ -1,10 +1,10 @@
[package]
name = "sen-native"
name = "cli"
version = "4.1.0"
authors = ["Inderjit Gill <email@indy.io>"]
edition = "2018"
license = "GPL-3.0+"

[dependencies]
sen-core = { path = "../sen-core" }
core = { path = "../core" }
clap = "2.32.0"

sen-native/pp.seni → cli/pp.seni View File


sen-native/prng-bug.seni → cli/prng-bug.seni View File


sen-native/src/main.rs → cli/src/main.rs View File

@@ -1,5 +1,5 @@
use clap::{value_t, App, Arg, ArgMatches};
use sen_core::*;
use core::*;

use std::fs::File;
use std::io::prelude::*;
@@ -10,7 +10,7 @@ pub enum NativeError {
GeneralError,
NoneError,
IoError(IoError),
SenError(sen_core::error::Error),
SenError(core::error::Error),
}

impl From<IoError> for NativeError {
@@ -19,8 +19,8 @@ impl From<IoError> for NativeError {
}
}

impl From<sen_core::error::Error> for NativeError {
fn from(e: sen_core::error::Error) -> NativeError {
impl From<core::error::Error> for NativeError {
fn from(e: core::error::Error) -> NativeError {
NativeError::SenError(e)
}
}
@@ -28,7 +28,7 @@ impl From<sen_core::error::Error> for NativeError {
pub type Result<T> = ::std::result::Result<T, NativeError>;

fn main() {
let matches = App::new("sen-native")
let matches = App::new("seni-cli")
.version("0.1.0")
.author("Inderjit Gill <email@indy.io>")
.about("native cli build of seni")

sen-core/.gitignore → client/.gitignore View File


sen-client/Cargo.toml → client/Cargo.toml View File

@@ -1,5 +1,5 @@
[package]
name = "sen-client"
name = "client"
version = "4.1.0"
authors = ["Inderjit Gill <email@indy.io>"]
edition = "2018"
@@ -13,7 +13,7 @@ default = ["console_error_panic_hook"]
[dependencies]
cfg-if = "0.1.2"
wasm-bindgen = "0.2"
sen-core = { path = "../sen-core" }
core = { path = "../core" }

# The `console_error_panic_hook` crate provides better debugging of panics by
# logging them with `console.error`. This is great for development, but requires

sen-client/build.bat → client/build.bat View File

@@ -6,7 +6,7 @@ setlocal EnableDelayedExpansion
if "%1" == "release" (
rem release build
cargo +nightly build --release --target wasm32-unknown-unknown
wasm-bindgen target/wasm32-unknown-unknown/release/sen_client.wasm --out-dir www --no-typescript --no-modules
wasm-bindgen target/wasm32-unknown-unknown/release/client.wasm --out-dir www --no-typescript --no-modules

rem isg note: in the early part of the Rust port, we'll have to use the js renderer, this requires access to the wasm memory, hence this hack
rem
@@ -14,7 +14,7 @@ rem sed -i "s/__exports.BridgeConfig = BridgeConfig;/__exports.BridgeConfig =

) else (
cargo +nightly build --target wasm32-unknown-unknown
wasm-bindgen target/wasm32-unknown-unknown/debug/sen_client.wasm --out-dir www --no-typescript --no-modules
wasm-bindgen target/wasm32-unknown-unknown/debug/client.wasm --out-dir www --no-typescript --no-modules

rem isg note: in the early part of the Rust port, we'll have to use the js renderer, this requires access to the wasm memory, hence this hack
rem

sen-client/build.sh → client/build.sh View File

@@ -3,14 +3,14 @@
if [ "$1" = "release" ]
then
cargo build --release --target wasm32-unknown-unknown
wasm-bindgen target/wasm32-unknown-unknown/release/sen_client.wasm --out-dir www --no-typescript --no-modules
wasm-bindgen target/wasm32-unknown-unknown/release/client.wasm --out-dir www --no-typescript --no-modules

# isg note: in the early part of the Rust port, we'll have to use the js renderer, this requires access to the wasm memory, hence this hack
#
# sed -i "s/__exports.BridgeConfig = BridgeConfig;/__exports.BridgeConfig = BridgeConfig;\n\/\/ ISG HACK\n__exports.wasm = wasm;/g" www/sokoban_client.js
else
cargo build --target wasm32-unknown-unknown
wasm-bindgen target/wasm32-unknown-unknown/debug/sen_client.wasm --out-dir www --no-typescript --no-modules
wasm-bindgen target/wasm32-unknown-unknown/debug/client.wasm --out-dir www --no-typescript --no-modules

# isg note: in the early part of the Rust port, we'll have to use the js renderer, this requires access to the wasm memory, hence this hack
#

sen-client/sed-hack.sh → client/sed-hack.sh View File

@@ -1,3 +1,3 @@
# isg note: in the early part of the Rust port, we'll have to use the js renderer, this requires access to the wasm memory, hence this hack
#
sed -i "s/__exports.BridgeConfig = BridgeConfig;/__exports.BridgeConfig = BridgeConfig;\n\/\/ ISG HACK\n__exports.wasm = wasm;/g" www/sen_client.js
sed -i "s/__exports.BridgeConfig = BridgeConfig;/__exports.BridgeConfig = BridgeConfig;\n\/\/ ISG HACK\n__exports.wasm = wasm;/g" www/client.js

sen-client/src/lib.rs → client/src/lib.rs View File

@@ -23,11 +23,11 @@ mod utils;
use cfg_if::cfg_if;
use wasm_bindgen::prelude::*;

use sen_core::{
use core::{
build_traits, compile_to_render_packets, compile_with_genotype_to_render_packets,
next_generation, simplified_unparse, unparse,
};
use sen_core::{Env, Genotype, Packable, TraitList, Vm};
use core::{Env, Genotype, Packable, TraitList, Vm};

cfg_if! {
// When the `wee_alloc` feature is enabled, use `wee_alloc` as the global

sen-client/src/utils.rs → client/src/utils.rs View File


+ 2
- 0
client/www/.gitignore View File

@@ -0,0 +1,2 @@
client.js
client_bg.wasm

sen-client/www/css/bones.css → client/www/css/bones.css View File


sen-client/www/css/indyio.css → client/www/css/indyio.css View File


sen-client/www/css/stylesheet.css → client/www/css/stylesheet.css View File


sen-client/www/favicon.ico → client/www/favicon.ico View File


sen-client/www/img/seni/14ef-blur-grid.png → client/www/img/seni/14ef-blur-grid.png View File


sen-client/www/img/seni/14eg-marker-grid.png → client/www/img/seni/14eg-marker-grid.png View File


sen-client/www/img/seni/14eh-chaotic-grid.png → client/www/img/seni/14eh-chaotic-grid.png View File


sen-client/www/img/seni/14fh-rothko-1.png → client/www/img/seni/14fh-rothko-1.png View File


sen-client/www/img/seni/151c-flower.png → client/www/img/seni/151c-flower.png View File


sen-client/www/img/seni/1531-four-squares.png → client/www/img/seni/1531-four-squares.png View File


sen-client/www/img/seni/154c-stroked-bezier.png → client/www/img/seni/154c-stroked-bezier.png View File


sen-client/www/img/seni/154h-rothko-2.png → client/www/img/seni/154h-rothko-2.png View File


sen-client/www/img/seni/1556-biomorphs.png → client/www/img/seni/1556-biomorphs.png View File


sen-client/www/img/seni/155b-spiral-derived.png → client/www/img/seni/155b-spiral-derived.png View File


sen-client/www/img/seni/155j-chaotic-grid-2.png → client/www/img/seni/155j-chaotic-grid-2.png View File


sen-client/www/img/seni/155j-chaotic-grid-3.png → client/www/img/seni/155j-chaotic-grid-3.png View File


sen-client/www/img/seni/1560-path.png → client/www/img/seni/1560-path.png View File


sen-client/www/img/seni/1565-hex-grid.png → client/www/img/seni/1565-hex-grid.png View File


sen-client/www/img/seni/156h-tri-grid.png → client/www/img/seni/156h-tri-grid.png View File


sen-client/www/img/seni/157e-tile-shadow.png → client/www/img/seni/157e-tile-shadow.png View File


sen-client/www/img/seni/1580-quilt.png → client/www/img/seni/1580-quilt.png View File


sen-client/www/img/seni/1585-seeds.png → client/www/img/seni/1585-seeds.png View File


sen-client/www/img/seni/15fe-rotate-mirror.png → client/www/img/seni/15fe-rotate-mirror.png View File


sen-client/www/img/seni/15h3-polychrome.png → client/www/img/seni/15h3-polychrome.png View File


sen-client/www/img/seni/15h3-rotate-mirror-2.png → client/www/img/seni/15h3-rotate-mirror-2.png View File


sen-client/www/img/seni/15h3-tri-grid.png → client/www/img/seni/15h3-tri-grid.png View File


sen-client/www/img/seni/15h4-chromatic-layers-1.png → client/www/img/seni/15h4-chromatic-layers-1.png View File


sen-client/www/img/seni/15h4-chromatic-layers-2.png → client/www/img/seni/15h4-chromatic-layers-2.png View File


sen-client/www/img/seni/15h4-chromatic-layers-3.png → client/www/img/seni/15h4-chromatic-layers-3.png View File


sen-client/www/img/seni/15h4-mirror-layers.png → client/www/img/seni/15h4-mirror-layers.png View File


sen-client/www/img/seni/15h4-rotate-mirror.png → client/www/img/seni/15h4-rotate-mirror.png View File


sen-client/www/img/seni/15he-cos-1.png → client/www/img/seni/15he-cos-1.png View File


sen-client/www/img/seni/15he-cos-2.png → client/www/img/seni/15he-cos-2.png View File


sen-client/www/img/seni/15he-cos-3.png → client/www/img/seni/15he-cos-3.png View File


sen-client/www/img/seni/15he-mirror-layers.png → client/www/img/seni/15he-mirror-layers.png View File


sen-client/www/img/seni/15he-rotate-mirror.png → client/www/img/seni/15he-rotate-mirror.png View File


sen-client/www/img/seni/160c-schotter.png → client/www/img/seni/160c-schotter.png View File


sen-client/www/img/seni/161g-grid-flow.png → client/www/img/seni/161g-grid-flow.png View File


sen-client/www/img/seni/161j-trump.png → client/www/img/seni/161j-trump.png View File


sen-client/www/img/seni/1626-embers.png → client/www/img/seni/1626-embers.png View File


sen-client/www/img/seni/1626-orchid.png → client/www/img/seni/1626-orchid.png View File


sen-client/www/img/seni/162e-alien.png → client/www/img/seni/162e-alien.png View File


sen-client/www/img/seni/162e-mask.png → client/www/img/seni/162e-mask.png View File


sen-client/www/img/seni/162e-slice.png → client/www/img/seni/162e-slice.png View File


sen-client/www/img/seni/162e-star.png → client/www/img/seni/162e-star.png View File


sen-client/www/img/seni/162e-x.png → client/www/img/seni/162e-x.png View File


sen-client/www/img/seni/1632-star.png → client/www/img/seni/1632-star.png View File


sen-client/www/img/seni/1633-dune.png → client/www/img/seni/1633-dune.png View File


sen-client/www/img/seni/1633-orchid.png → client/www/img/seni/1633-orchid.png View File


sen-client/www/img/seni/1633-petal.png → client/www/img/seni/1633-petal.png View File


sen-client/www/img/seni/1634-cryst.png → client/www/img/seni/1634-cryst.png View File


sen-client/www/img/seni/1638-night.png → client/www/img/seni/1638-night.png View File


sen-client/www/img/seni/163a-scale-green.png → client/www/img/seni/163a-scale-green.png View File


sen-client/www/img/seni/1642-book-stack.png → client/www/img/seni/1642-book-stack.png View File


sen-client/www/img/seni/1642-stacks.png → client/www/img/seni/1642-stacks.png View File


sen-client/www/img/seni/1643-hyp.png → client/www/img/seni/1643-hyp.png View File


sen-client/www/img/seni/1643-paren.png → client/www/img/seni/1643-paren.png View File


sen-client/www/img/seni/1643-rose.png → client/www/img/seni/1643-rose.png View File


sen-client/www/img/seni/1643-thorn.png → client/www/img/seni/1643-thorn.png View File


sen-client/www/img/seni/1648-chalk-boxes.png → client/www/img/seni/1648-chalk-boxes.png View File


sen-client/www/img/seni/1743-dragon.png → client/www/img/seni/1743-dragon.png View File


sen-client/www/img/seni/1743-grose.png → client/www/img/seni/1743-grose.png View File


sen-client/www/img/seni/1743-segs.png → client/www/img/seni/1743-segs.png View File


sen-client/www/img/seni/1743-shell.png → client/www/img/seni/1743-shell.png View File


sen-client/www/img/seni/1748-orchid-b.png → client/www/img/seni/1748-orchid-b.png View File


sen-client/www/img/seni/1840-boxes.png → client/www/img/seni/1840-boxes.png View File


sen-client/www/img/seni/1841-nib.png → client/www/img/seni/1841-nib.png View File


sen-client/www/img/seni/blank.png → client/www/img/seni/blank.png View File


sen-client/www/img/spinner.gif → client/www/img/spinner.gif View File


sen-client/www/img/texture.png → client/www/img/texture.png View File


sen-client/www/index.html → client/www/index.html View File

@@ -83,7 +83,7 @@
</script>

<!-- this is the JS generated by the `wasm-bindgen` CLI tool -->
<script src='./sen_client.js'></script>
<script src='./client.js'></script>

<script src='index.js'></script>


sen-client/www/index.js → client/www/index.js View File


sen-client/www/lib/codemirror/LICENSE → client/www/lib/codemirror/LICENSE View File


sen-client/www/lib/codemirror/closebrackets.js → client/www/lib/codemirror/closebrackets.js View File


sen-client/www/lib/codemirror/codemirror.css → client/www/lib/codemirror/codemirror.css View File


sen-client/www/lib/codemirror/codemirror.js → client/www/lib/codemirror/codemirror.js View File


sen-client/www/lib/codemirror/matchbrackets.js → client/www/lib/codemirror/matchbrackets.js View File


sen-client/www/piece.html → client/www/piece.html View File


sen-client/www/sw.js → client/www/sw.js View File


sen-client/www/worker.js → client/www/worker.js View File

@@ -36,7 +36,7 @@
return cachedTextDecoder.decode(getUint8Memory().subarray(ptr, ptr + len));
}

__exports.__wbg_log_71c040d88e754893 = function(arg0, arg1) {
__exports.__wbg_log_d456f8db0027ba21 = function(arg0, arg1) {
let varg0 = getStringFromWasm(arg0, arg1);
console.log(varg0);
};
@@ -327,13 +327,13 @@
// ISG HACK
__exports.wasm = wasm;

__exports.__wbindgen_throw = function(ptr, len) {
__exports.__wbindgen_throw = function(ptr, len) {
throw new Error(getStringFromWasm(ptr, len));
};

function init(path_or_module) {
let instantiation;
const imports = { './sen_client': __exports };
const imports = { './client': __exports };
if (path_or_module instanceof WebAssembly.Module) {
instantiation = WebAssembly.instantiate(path_or_module, imports)
.then(instance => {
@@ -357,7 +357,6 @@
self.wasm_bindgen = Object.assign(init, __exports);
})();


/*
// copy this line into the wasm_bindgen object above whenever it's regenerated

@@ -680,7 +679,7 @@ addEventListener('message', e => {
}
});

wasm_bindgen('./sen_client_bg.wasm')
wasm_bindgen('./client_bg.wasm')
.then(() => {
// hack to access the memory
// the build.sh has a sed command to export the wasm object

sen-native/.gitignore → core/.gitignore View File


sen-core/Cargo.toml → core/Cargo.toml View File

@@ -1,5 +1,5 @@
[package]
name = "sen-core"
name = "core"
version = "4.1.0"
authors = ["Inderjit Gill <email@indy.io>"]
license = "GPL-3.0+"

sen-core/src/colour.rs → core/src/colour.rs View File


sen-core/src/compiler.rs → core/src/compiler.rs View File


sen-core/src/ease.rs → core/src/ease.rs View File


sen-core/src/error.rs → core/src/error.rs View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save