Home Explore Help
Sign In
n4u
/
game_svg_erl_demo
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix fresh load on srv5

kakauser 11 years ago
parent
5aa3857d44
commit
43f8cfc6be
7 changed files with 16 additions and 7 deletions
Unified View Show Diff Stats
  1. 0 1
      Makefile
  2. 4 1
      apps/face/priv/static/doc/svg.htm
  3. 6 2
      apps/face/priv/static/doc/svg.js
  4. 2 2
      apps/face/priv/templates/index.html
  5. 2 0
      apps/face/src/routes.erl
  6. 1 0
      otp.mk
  7. 1 1
      rels/web/files/sys.config

+ 0 - 1
Makefile
View File 

@@ -16,4 +16,3 @@ static-link:
 
 	ln -s ../../../../deps/n2o_scripts/n2o $(APP)
 
 	ln -s ../../../../deps/n2o_scripts/n2o $(APP)
 
 
 
 include otp.mk
 
 include otp.mk
 
-include erl.mk

+ 4 - 1
apps/face/priv/static/doc/svg.htm
View File 

@@ -5,6 +5,7 @@
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 
 
+
 
 <div class="threecol">
 
 <div class="threecol">
 
 
 
 <div class="left">
 
 <div class="left">
 
@@ -199,6 +200,9 @@ loadFile('templates/Card.svg', drawSampleCards);
 
 
 
 <button id="MustafaSelection" style="font-size:28pt;">Toggle Mustafa Selection</button>
 
 <button id="MustafaSelection" style="font-size:28pt;">Toggle Mustafa Selection</button>
 
 
 
+<script src='svg.js' type='text/javascript' charset='utf-8'></script>
 
+
 
+
 
 <code style="font-size: 6pt;">
 
 <code style="font-size: 6pt;">
 
 
 
 &lt;g id="Mustafa-Persona" sketch:type="MSLayerGroup" transform="translate(467.000000, 150.000000)"&gt;
 
 &lt;g id="Mustafa-Persona" sketch:type="MSLayerGroup" transform="translate(467.000000, 150.000000)"&gt;
 
@@ -283,7 +287,6 @@ XML елементами, як це є в WPF наприклад. Тут спр
 
 
 
 </div>
 
 </div>
 
 
 
-<script src='svg.js' type='text/javascript' charset='utf-8'></script>
 
 
 
 <script src='../nitrogen/bullet.js' type='text/javascript' charset='utf-8'></script>
 
 <script src='../nitrogen/bullet.js' type='text/javascript' charset='utf-8'></script>
 
 <script src='../nitrogen/n2o.js' type='text/javascript' charset='utf-8'></script>
 
 <script src='../nitrogen/n2o.js' type='text/javascript' charset='utf-8'></script>

+ 6 - 2
apps/face/priv/static/doc/svg.js
View File 

@@ -105,7 +105,7 @@ function rand(lo,hi) { return Math.floor((Math.random()*hi)+lo); }
 
 function loadScene() {
 
 function loadScene() {
 
     reload("Kakaranet-7-Refined.svg", "Refined");
 
     reload("Kakaranet-7-Refined.svg", "Refined");
 
     for (var i=1;i<15;i++) { empty_card(i,2); empty_card(i,1); }
 
     for (var i=1;i<15;i++) { empty_card(i,2); empty_card(i,1); }
 
-    loadFile('templates/Card.svg', drawSampleCards); }
 
+    drawSampleCards(); }
 
 
 
 function findPlace() {
 
 function findPlace() {
 
     for (var y=1;y<3;y++) for (var x=1;x<15;x++) {
 
     for (var y=1;y<3;y++) for (var x=1;x<15;x++) {
 
@@ -129,7 +129,11 @@ function findCardOnTable(c,v) {
 
     console.log("Card Not Found");
 
     console.log("Card Not Found");
 
     return ""; }
 
     return ""; }
 
 
 
-loadFile('Kakaranet-7-Refined.svg', loadScene);
 
+// Monadic Chain here
 
+
 
+loadFile('templates/Card.svg', function() { 
+  loadFile('Kakaranet-7-Refined.svg', loadScene); 
+});
 
 
 
 // SVG Samples for svg.htm
 
 // SVG Samples for svg.htm

+ 2 - 2
apps/face/priv/templates/index.html
View File 

@@ -6,12 +6,12 @@
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 {{body}}
 
 {{body}}
 
-<script>var transition = {pid: '', port: '8000' };</script>
 
+<script>var transition = {pid: '', port: '8080' };</script>
 
 <script>function handle_web_socket(body) { console.log(String(dec(body))); } </script>
 
 <script>function handle_web_socket(body) { console.log(String(dec(body))); } </script>
 
 <script src='/static/nitrogen/bullet.js' type='text/javascript' charset='utf-8'></script>
 
 <script src='/static/nitrogen/bullet.js' type='text/javascript' charset='utf-8'></script>
 
 <script src='/static/nitrogen/n2o.js' type='text/javascript' charset='utf-8'></script>
 
 <script src='/static/nitrogen/n2o.js' type='text/javascript' charset='utf-8'></script>
 
 <script src='/static/nitrogen/bert.js' type='text/javascript' charset='utf-8'></script>
 
 <script src='/static/nitrogen/bert.js' type='text/javascript' charset='utf-8'></script>
 
-<script src='/static/google_sdk.js' type='text/javascript' charset='utf-8'></script>
 
+<!--script src='/static/google_sdk.js' type='text/javascript' charset='utf-8'></script-->
 
 </script><div id="n2ostatus"></div>
 
 </script><div id="n2ostatus"></div>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 2 - 0
apps/face/src/routes.erl
View File 

@@ -6,6 +6,8 @@
 
 finish(State, Ctx) -> {ok, State, Ctx}.
 
 finish(State, Ctx) -> {ok, State, Ctx}.
 
 init(State, Ctx) -> 
 init(State, Ctx) -> 
     Path = wf:path(Ctx#context.req),
 
     Path = wf:path(Ctx#context.req),
 
+	wf:info("ROute: ~p",[Path]),
 
+    
     Module = route_prefix(Path),
 
     Module = route_prefix(Path),
 
     {ok, State, Ctx#context{path=Path,module=Module}}.
 
     {ok, State, Ctx#context{path=Path,module=Module}}.

+ 1 - 0
otp.mk
View File 

@@ -22,6 +22,7 @@ delete-deps get-deps compile clean update-deps:
 
 $(RUN_DIR) $(LOG_DIR):
 
 $(RUN_DIR) $(LOG_DIR):
 
 	mkdir -p $(RUN_DIR) & mkdir -p $(LOG_DIR)
 
 	mkdir -p $(RUN_DIR) & mkdir -p $(LOG_DIR)
 
 console: .applist
 
 console: .applist
 
+	echo $(APPS)
 
 	ERL_LIBS=$(ERL_LIBS) erl $(ERL_ARGS) -eval \
 
 	ERL_LIBS=$(ERL_LIBS) erl $(ERL_ARGS) -eval \
 
 		'[ok = application:ensure_started(A, permanent) || A <- $(shell cat .applist)]'
 
 		'[ok = application:ensure_started(A, permanent) || A <- $(shell cat .applist)]'
 
 start: $(RUN_DIR) $(LOG_DIR) .applist
 
 start: $(RUN_DIR) $(LOG_DIR) .applist

+ 1 - 1
rels/web/files/sys.config
View File 

@@ -1,7 +1,7 @@
 
 [
 
 [
 
  {sync, [{sync_mode, nitrogen}]},
 
  {sync, [{sync_mode, nitrogen}]},
 
  {nsx_idgen, [{game_pool,5000000}]},
 
  {nsx_idgen, [{game_pool,5000000}]},
 
- {n2o, [{route,routes},{port,8443},{transition_port,8000}]},
 
+ {n2o, [{route,routes},{port,8443},{transition_port,8080}]},
 
  {face,[
 
  {face,[
 
     {http_address, "http://skyline.synrc.com"},
 
     {http_address, "http://skyline.synrc.com"},
 
     {gplus_client_id, "146782506820.apps.googleusercontent.com"},
 
     {gplus_client_id, "146782506820.apps.googleusercontent.com"},