euslisp-commit Mailing List for EusLisp (Page 2)

Brought to you by: inaba-jsk, k-okada, kyouhei

euslisp-commit — euslisp commit mailing list

You can subscribe to this list here.

2013	_Jan	_Feb	_Mar	_Apr (31)	_May (50)	_Jun (6)	_Jul (8)	_Aug (4)	_Sep (2)	_Oct (4)	_Nov (6)	_Dec
2014	_Jan (24)	_Feb (2)	_Mar	_Apr	_May (2)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 2 3 4 .. 6 > >> (Page 2 of 6)

[Euslisp-commit] SF.net SVN: euslisp:[660] trunk/EusLisp/doc/jlatex/Makefile

From: <k-...@us...> - 2014-01-23 07:10:44

Revision: 660
          http://sourceforge.net/p/euslisp/code/660
Author:   k-okada
Date:     2014-01-23 07:10:37 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
make sure to run platex twice, see Issue #54

Modified Paths:
--------------
    trunk/EusLisp/doc/jlatex/Makefile

Modified: trunk/EusLisp/doc/jlatex/Makefile
===================================================================
--- trunk/EusLisp/doc/jlatex/Makefile	2014-01-23 05:29:33 UTC (rev 659)
+++ trunk/EusLisp/doc/jlatex/Makefile	2014-01-23 07:10:37 UTC (rev 660)
@@ -1,5 +1,5 @@
 all:
-	make toc dvi dvi pdf
+	make toc dvi pdf
 
 
 toc:
@@ -7,6 +7,7 @@
 
 dvi:
 	platex jmanual.tex
+	platex jmanual.tex
 
 pdf:
 	dvipdfmx jmanual.dvi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[659] trunk/EusLisp/doc/jlatex/Makefile

From: <k-...@us...> - 2014-01-23 05:29:40

Revision: 659
          http://sourceforge.net/p/euslisp/code/659
Author:   k-okada
Date:     2014-01-23 05:29:33 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
generate toc for jmanual

Modified Paths:
--------------
    trunk/EusLisp/doc/jlatex/Makefile

Modified: trunk/EusLisp/doc/jlatex/Makefile
===================================================================
--- trunk/EusLisp/doc/jlatex/Makefile	2013-11-29 09:29:09 UTC (rev 658)
+++ trunk/EusLisp/doc/jlatex/Makefile	2014-01-23 05:29:33 UTC (rev 659)
@@ -1,6 +1,10 @@
 all:
-	make dvi dvi pdf
+	make toc dvi dvi pdf
 
+
+toc:
+	makeindex jmanual.tex
+
 dvi:
 	platex jmanual.tex
 
@@ -9,4 +13,7 @@
 
 
 clean:
-	rm -f *~ *.aux
+	rm -f *~ *.aux *.idx *.log *.toc *.out *.ind *.ilg
+
+distclean: clean
+	rm -f *.dvi *.pdf
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[659] trunk/EusLisp/doc/jlatex/Makefile

From: <k-...@us...> - 2014-01-23 05:29:38

Revision: 659
          http://sourceforge.net/p/euslisp/code/659
Author:   k-okada
Date:     2014-01-23 05:29:33 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
generate toc for jmanual

Modified Paths:
--------------
    trunk/EusLisp/doc/jlatex/Makefile

Modified: trunk/EusLisp/doc/jlatex/Makefile
===================================================================
--- trunk/EusLisp/doc/jlatex/Makefile	2013-11-29 09:29:09 UTC (rev 658)
+++ trunk/EusLisp/doc/jlatex/Makefile	2014-01-23 05:29:33 UTC (rev 659)
@@ -1,6 +1,10 @@
 all:
-	make dvi dvi pdf
+	make toc dvi dvi pdf
 
+
+toc:
+	makeindex jmanual.tex
+
 dvi:
 	platex jmanual.tex
 
@@ -9,4 +13,7 @@
 
 
 clean:
-	rm -f *~ *.aux
+	rm -f *~ *.aux *.idx *.log *.toc *.out *.ind *.ilg
+
+distclean: clean
+	rm -f *.dvi *.pdf
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[658] trunk/EusLisp/lisp

From: <k-...@us...> - 2013-11-29 09:29:16

Revision: 658
          http://sourceforge.net/p/euslisp/code/658
Author:   k-okada
Date:     2013-11-29 09:29:09 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
fix Darwin support, thanks furushchev, see Issue #45 (https://sourceforge.net/p/jskeus/tickets/45/) 

Modified Paths:
--------------
    trunk/EusLisp/lisp/Makefile.Darwin
    trunk/EusLisp/lisp/xwindow/xforeign.c.c

Modified: trunk/EusLisp/lisp/Makefile.Darwin
===================================================================
--- trunk/EusLisp/lisp/Makefile.Darwin	2013-11-23 00:00:14 UTC (rev 657)
+++ trunk/EusLisp/lisp/Makefile.Darwin	2013-11-29 09:29:09 UTC (rev 658)
@@ -53,11 +53,11 @@
 # If you use libc.so.5, remove -DLIB6 option.
 # In order to include thread library, libc.so.6 is preferrable.
 
-CFLAGS=-D$(MACHINE) -DLinux -D_REENTRANT -DVERSION=\"$(VERSION)\" -DDarwin \
+CFLAGS=-D$(MACHINE) -Wno-return-type -DLinux -D_REENTRANT -DVERSION=\"$(VERSION)\" -DDarwin \
 	-DLIB6 $(ALIGN_FUNCTIONS)  \
         $(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \
 	-DGCC $(GCC3) \
-        -I/usr/include -I/opt/local/include -I/usr/X11/include -I$(EUSDIR)/include
+        -I/usr/include -I/opt/local/include -I/opt/X11/include -I$(EUSDIR)/include
 
 # Use gcc for C-compiling on SunOS4. Sun's cc is ok on Solaris.
 # /usr/ucb/cc cannot compile because of its incapability of recognizing
@@ -78,11 +78,11 @@
 # On Solaris, XLIB and EUSLIB are combined together into lib/libeusx.so.
 
 RAWLIB=-ldl -lm -lpthread
-XLIB= -L/opt/local/lib -L/usr/X11/lib -lX11
+XLIB= -L/opt/local/lib -L/opt/X11/lib -lX11
 
 # specify directories where euslisp's libraries are located.
 EUSLIB= -L$(ADLIBDIR)
-GLLIB= -L$(ADLIBDIR) -lGLU -lGL -lXext -leusgl
+GLLIB= -L$/opt/X11/lib -lGLU -lGL -lXext -leusgl
 
 # POSIX Thread 
 THREADDEP=mthread_posix.c

Modified: trunk/EusLisp/lisp/xwindow/xforeign.c.c
===================================================================
--- trunk/EusLisp/lisp/xwindow/xforeign.c.c	2013-11-23 00:00:14 UTC (rev 657)
+++ trunk/EusLisp/lisp/xwindow/xforeign.c.c	2013-11-29 09:29:09 UTC (rev 658)
@@ -426,7 +426,7 @@
    entry=(eusinteger_t)dlsym(dlhandle, xentry);
 #elif Darwin
    eusinteger_t dlhandle;
-   dlhandle=(eusinteger_t)dlopen("/opt/local/lib/libX11.dylib", RTLD_LAZY);
+   dlhandle=(eusinteger_t)dlopen("/opt/X11/lib/libX11.dylib", RTLD_LAZY);
    if( dlhandle==0 )
      dlhandle=(eusinteger_t)dlopen("libX11.dylib", RTLD_LAZY);
    entry=(eusinteger_t)dlsym(dlhandle, xentry);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[658] trunk/EusLisp/lisp

From: <k-...@us...> - 2013-11-29 09:29:14

Revision: 658
          http://sourceforge.net/p/euslisp/code/658
Author:   k-okada
Date:     2013-11-29 09:29:09 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
fix Darwin support, thanks furushchev, see Issue #45 (https://sourceforge.net/p/jskeus/tickets/45/) 

Modified Paths:
--------------
    trunk/EusLisp/lisp/Makefile.Darwin
    trunk/EusLisp/lisp/xwindow/xforeign.c.c

Modified: trunk/EusLisp/lisp/Makefile.Darwin
===================================================================
--- trunk/EusLisp/lisp/Makefile.Darwin	2013-11-23 00:00:14 UTC (rev 657)
+++ trunk/EusLisp/lisp/Makefile.Darwin	2013-11-29 09:29:09 UTC (rev 658)
@@ -53,11 +53,11 @@
 # If you use libc.so.5, remove -DLIB6 option.
 # In order to include thread library, libc.so.6 is preferrable.
 
-CFLAGS=-D$(MACHINE) -DLinux -D_REENTRANT -DVERSION=\"$(VERSION)\" -DDarwin \
+CFLAGS=-D$(MACHINE) -Wno-return-type -DLinux -D_REENTRANT -DVERSION=\"$(VERSION)\" -DDarwin \
 	-DLIB6 $(ALIGN_FUNCTIONS)  \
         $(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \
 	-DGCC $(GCC3) \
-        -I/usr/include -I/opt/local/include -I/usr/X11/include -I$(EUSDIR)/include
+        -I/usr/include -I/opt/local/include -I/opt/X11/include -I$(EUSDIR)/include
 
 # Use gcc for C-compiling on SunOS4. Sun's cc is ok on Solaris.
 # /usr/ucb/cc cannot compile because of its incapability of recognizing
@@ -78,11 +78,11 @@
 # On Solaris, XLIB and EUSLIB are combined together into lib/libeusx.so.
 
 RAWLIB=-ldl -lm -lpthread
-XLIB= -L/opt/local/lib -L/usr/X11/lib -lX11
+XLIB= -L/opt/local/lib -L/opt/X11/lib -lX11
 
 # specify directories where euslisp's libraries are located.
 EUSLIB= -L$(ADLIBDIR)
-GLLIB= -L$(ADLIBDIR) -lGLU -lGL -lXext -leusgl
+GLLIB= -L$/opt/X11/lib -lGLU -lGL -lXext -leusgl
 
 # POSIX Thread 
 THREADDEP=mthread_posix.c

Modified: trunk/EusLisp/lisp/xwindow/xforeign.c.c
===================================================================
--- trunk/EusLisp/lisp/xwindow/xforeign.c.c	2013-11-23 00:00:14 UTC (rev 657)
+++ trunk/EusLisp/lisp/xwindow/xforeign.c.c	2013-11-29 09:29:09 UTC (rev 658)
@@ -426,7 +426,7 @@
    entry=(eusinteger_t)dlsym(dlhandle, xentry);
 #elif Darwin
    eusinteger_t dlhandle;
-   dlhandle=(eusinteger_t)dlopen("/opt/local/lib/libX11.dylib", RTLD_LAZY);
+   dlhandle=(eusinteger_t)dlopen("/opt/X11/lib/libX11.dylib", RTLD_LAZY);
    if( dlhandle==0 )
      dlhandle=(eusinteger_t)dlopen("libX11.dylib", RTLD_LAZY);
    entry=(eusinteger_t)dlsym(dlhandle, xentry);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[657] trunk/EusLisp/lib/llib/unittest.l

From: <k-...@us...> - 2013-11-23 00:00:25

Revision: 657
          http://sourceforge.net/p/euslisp/code/657
Author:   k-okada
Date:     2013-11-23 00:00:14 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
set number of test is number of assrt, https://sourceforge.net/p/jskeus/tickets/44/

Modified Paths:
--------------
    trunk/EusLisp/lib/llib/unittest.l

Modified: trunk/EusLisp/lib/llib/unittest.l
===================================================================
--- trunk/EusLisp/lib/llib/unittest.l	2013-11-22 23:34:02 UTC (rev 656)
+++ trunk/EusLisp/lib/llib/unittest.l	2013-11-23 00:00:14 UTC (rev 657)
@@ -56,7 +56,7 @@
   (:init (n) (setq name n tests nil failures nil time 0))
   (:tests () tests)
   (:num-tests () (length tests))
-  (:num-failures () (if failures 1 0)) ;; need fix
+  (:num-failures () (length failures))
   (:num-successes () (- (send self :num-tests) (send self :num-failures)))
   (:time () time)
   (:prin1
@@ -123,8 +123,7 @@
    (push (instance unit-test-result :init func-sym) result))
   (:clear-result ()
    (setq result nil)
-   (send self :init-result 'all-test)
-   (send self :increment-test 'all-test))
+   )
   ;;
   (:print-xml-result
    (&optional (strm t))
@@ -176,7 +175,6 @@
     (send *unit-test* :init-result func-sym)
     (format t "TEST-NAME: ~A~%" func-sym)
     (format t "  now testing...~%")
-    (send *unit-test* :increment-test func-sym)
     (setq tm (instance mtimer :init))
     (send tm :start)
     (funcall func)
@@ -213,6 +211,7 @@
 	  ;;	 (setq ret (lisp::step ,pred))
 	  ;;       (setq ret ,pred))
 	  ;;
+	  (send *unit-test* :increment-test ',pred)
 	  (if (not ret)
 	      ;; escape <> for xml
 	      (send *unit-test* :increment-failure ',pred (format nil ,message ,@args)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[657] trunk/EusLisp/lib/llib/unittest.l

From: <k-...@us...> - 2013-11-23 00:00:23

Revision: 657
          http://sourceforge.net/p/euslisp/code/657
Author:   k-okada
Date:     2013-11-23 00:00:14 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
set number of test is number of assrt, https://sourceforge.net/p/jskeus/tickets/44/

Modified Paths:
--------------
    trunk/EusLisp/lib/llib/unittest.l

Modified: trunk/EusLisp/lib/llib/unittest.l
===================================================================
--- trunk/EusLisp/lib/llib/unittest.l	2013-11-22 23:34:02 UTC (rev 656)
+++ trunk/EusLisp/lib/llib/unittest.l	2013-11-23 00:00:14 UTC (rev 657)
@@ -56,7 +56,7 @@
   (:init (n) (setq name n tests nil failures nil time 0))
   (:tests () tests)
   (:num-tests () (length tests))
-  (:num-failures () (if failures 1 0)) ;; need fix
+  (:num-failures () (length failures))
   (:num-successes () (- (send self :num-tests) (send self :num-failures)))
   (:time () time)
   (:prin1
@@ -123,8 +123,7 @@
    (push (instance unit-test-result :init func-sym) result))
   (:clear-result ()
    (setq result nil)
-   (send self :init-result 'all-test)
-   (send self :increment-test 'all-test))
+   )
   ;;
   (:print-xml-result
    (&optional (strm t))
@@ -176,7 +175,6 @@
     (send *unit-test* :init-result func-sym)
     (format t "TEST-NAME: ~A~%" func-sym)
     (format t "  now testing...~%")
-    (send *unit-test* :increment-test func-sym)
     (setq tm (instance mtimer :init))
     (send tm :start)
     (funcall func)
@@ -213,6 +211,7 @@
 	  ;;	 (setq ret (lisp::step ,pred))
 	  ;;       (setq ret ,pred))
 	  ;;
+	  (send *unit-test* :increment-test ',pred)
 	  (if (not ret)
 	      ;; escape <> for xml
 	      (send *unit-test* :increment-failure ',pred (format nil ,message ,@args)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[656] trunk/EusLisp/lib/llib/unittest.l

From: <k-...@us...> - 2013-11-22 23:34:11

Revision: 656
          http://sourceforge.net/p/euslisp/code/656
Author:   k-okada
Date:     2013-11-22 23:34:02 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
make sure that color is back to black

Modified Paths:
--------------
    trunk/EusLisp/lib/llib/unittest.l

Modified: trunk/EusLisp/lib/llib/unittest.l
===================================================================
--- trunk/EusLisp/lib/llib/unittest.l	2013-10-25 08:29:24 UTC (rev 655)
+++ trunk/EusLisp/lib/llib/unittest.l	2013-11-22 23:34:02 UTC (rev 656)
@@ -66,9 +66,10 @@
    (format strm "    PASSED:   ~A~%" (send self :num-successes))
    (if (> (send self :num-failures) 0)
        (format strm "~C[3~Cm" #x1b 49))
-   (format strm "    FAILURE:  ~A~%" (send self :num-failures))
+   (format strm "    FAILURE:  ~A" (send self :num-failures))
    (if (> (send self :num-failures) 0)
-       (format strm "~C[0m" #x1b))
+       (format strm "~C[0m~%" #x1b)
+     (format strm "~%"))
    )
   (:prin1-xml
    (strm)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[656] trunk/EusLisp/lib/llib/unittest.l

From: <k-...@us...> - 2013-11-22 23:34:09

Revision: 656
          http://sourceforge.net/p/euslisp/code/656
Author:   k-okada
Date:     2013-11-22 23:34:02 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
make sure that color is back to black

Modified Paths:
--------------
    trunk/EusLisp/lib/llib/unittest.l

Modified: trunk/EusLisp/lib/llib/unittest.l
===================================================================
--- trunk/EusLisp/lib/llib/unittest.l	2013-10-25 08:29:24 UTC (rev 655)
+++ trunk/EusLisp/lib/llib/unittest.l	2013-11-22 23:34:02 UTC (rev 656)
@@ -66,9 +66,10 @@
    (format strm "    PASSED:   ~A~%" (send self :num-successes))
    (if (> (send self :num-failures) 0)
        (format strm "~C[3~Cm" #x1b 49))
-   (format strm "    FAILURE:  ~A~%" (send self :num-failures))
+   (format strm "    FAILURE:  ~A" (send self :num-failures))
    (if (> (send self :num-failures) 0)
-       (format strm "~C[0m" #x1b))
+       (format strm "~C[0m~%" #x1b)
+     (format strm "~%"))
    )
   (:prin1-xml
    (strm)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[655] trunk/EusLisp/models/load-irt-all-objects.l

From: <sn...@us...> - 2013-10-25 08:29:32

Revision: 655
          http://sourceforge.net/p/euslisp/code/655
Author:   snozawa
Date:     2013-10-25 08:29:24 +0000 (Fri, 25 Oct 2013)
Log Message:
-----------
add hitachi-18l-oven

Modified Paths:
--------------
    trunk/EusLisp/models/load-irt-all-objects.l

Modified: trunk/EusLisp/models/load-irt-all-objects.l
===================================================================
--- trunk/EusLisp/models/load-irt-all-objects.l	2013-10-11 09:14:17 UTC (rev 654)
+++ trunk/EusLisp/models/load-irt-all-objects.l	2013-10-25 08:29:24 UTC (rev 655)
@@ -392,6 +392,9 @@
 (warning-message 2 "loading 3t-600-clean-locker-object.l	(3t-600-clean-locker) for make model~%")
 (load "models/3t-600-clean-locker-object.l")
 
+(warning-message 2 "loading hitachi-18l-oven-object.l	(hitachi-18l-oven) for make model~%")
+(load "models/hitachi-18l-oven-object.l")
+
 (warning-message 2 "loading toshiba-microwave-oven-object.l	(toshiba-microwave-oven) for make model~%")
 (load "models/toshiba-microwave-oven-object.l")
 
@@ -420,4 +423,4 @@
 (load "models/bidirectional-arrow-object.l")
 ;;
 ;;
-(setq *irt-all-objects* '( (bidirectional-arrow) (arrow) (arrow-1000) (askul-gdh-cupboard) (askul-ntr-cupboard) (toshiba-clacio-refrigerator) (hitachi-fiesta-refrigerator) (refrigerator) (toshiba-microwave-oven) (3t-600-clean-locker) (kokuyo-450-locker) (washing-machine) (laundry-machine) (square-600-closet) (plus-900-square-desk) (plus-1700-desk) (plus-1800-desk) (plus-1800w-desk) (plus-2800-desk) (plus-7000-desk) (plus-6200-desk) (uchida-1500-desk) (uchida-1000-desk) (plus-1800-pdesk) (lion-1800-desk) (unknown-1200-desk) (uchida-1800-desk) (uchida-2400-desk) (uchida-monitor-leg) (uchida-desk) (toyama-900-desk) (desk) (askul-1200x700-desk) (askul-1400-desk) (askul-1200-desk) (askul-corner-desk) (askul-2700-desk) (nissen-1100-desk) (karimoku-1200-desk) (kokuyo-600-sidetable) (toyama-900-sidetable) (toyama-1800-sidetable) (fujitsu-42-plasmatv) (hitachi-42-plasmatv) (sharp-52-aquostv) (ideainternational-300-analog-clock) (casio-330-analog-clock) (maruman-55-analog-clock) (docomo-p504is) (sushi-cup) (tognana-pasta-dish) (frying-pan) (iron-table) (blue-clear-cup) (white-bread-salad-dish) (flower-tea-cup-dish) (toshiba-iron) (sharp-iron) (akiba-tv-desk) (akiba-desk) (itoki-900-closet) (itoki-900-shelf) (itoki-900-slide-shelf) (naiki-6door-closet) (bariera-900-left) (bariera-900-middle) (bariera-1200-corner) (bariera-1200-middle) (bariera-1200-middle2) (bariera-1200-middle3) (bariera-1200-right) (bariera-1400-middle) (door) (akiba-door) (akiba-door-window) (akiba-room-door) (coe-sofa2) (coe-sofa) (coe-demospace) (sakae-900-desk) (coe-800-shelf) (coe-1200-shelf) (coe-450-shelf) (coe-corner-shelf) (uchida-shelf-1100) (uchida-shelf-1300) (red-chair0) (trashbox) (coe-stairs) (coe-light) (askul-1600-desk) (fridge) (cupboard) (audio_shelf) (asplund-cabinet-4dan) (asplund-cabinet-4danbase) (shelf) (karimoku-kannonbiraki-cabinet) (tray) (bears-panel) (brown-board) (multibox-shelf) (single-arrow) (cardboard-box) (chair) (kettle) (knife) (sponge) (dining-table) (cup) (mug-cup) (ball) (book) (petbottle) (pockey) (plasmatv) (hrp2-rack) (hrp2-shelf) (coffee-cup-cup) (coffee-cup-saucer) (picaladder) (azuma-broom) (azuma-short-broom) (bamboo-broom) (broom) (elevator_call_panel) (elevator_inside_panel) (elevator_call_panel_eng2) (elevator_inside_panel_eng2) (chessboard-108-9x7) (chessboard-30-7x5) (chessboard-30-6x5) (chessboard-10-3x3) (foldable-desk) (gifuplastic-900-cart) (gifuplastic-720-cart) (darkgoldenrod-stairs) (misumi-handrail)))
\ No newline at end of file
+(setq *irt-all-objects* '( (bidirectional-arrow) (arrow) (arrow-1000) (askul-gdh-cupboard) (askul-ntr-cupboard) (toshiba-clacio-refrigerator) (hitachi-fiesta-refrigerator) (refrigerator) (toshiba-microwave-oven) (hitachi-18l-oven) (3t-600-clean-locker) (kokuyo-450-locker) (washing-machine) (laundry-machine) (square-600-closet) (plus-900-square-desk) (plus-1700-desk) (plus-1800-desk) (plus-1800w-desk) (plus-2800-desk) (plus-7000-desk) (plus-6200-desk) (uchida-1500-desk) (uchida-1000-desk) (plus-1800-pdesk) (lion-1800-desk) (unknown-1200-desk) (uchida-1800-desk) (uchida-2400-desk) (uchida-monitor-leg) (uchida-desk) (toyama-900-desk) (desk) (askul-1200x700-desk) (askul-1400-desk) (askul-1200-desk) (askul-corner-desk) (askul-2700-desk) (nissen-1100-desk) (karimoku-1200-desk) (kokuyo-600-sidetable) (toyama-900-sidetable) (toyama-1800-sidetable) (fujitsu-42-plasmatv) (hitachi-42-plasmatv) (sharp-52-aquostv) (ideainternational-300-analog-clock) (casio-330-analog-clock) (maruman-55-analog-clock) (docomo-p504is) (sushi-cup) (tognana-pasta-dish) (frying-pan) (iron-table) (blue-clear-cup) (white-bread-salad-dish) (flower-tea-cup-dish) (toshiba-iron) (sharp-iron) (akiba-tv-desk) (akiba-desk) (itoki-900-closet) (itoki-900-shelf) (itoki-900-slide-shelf) (naiki-6door-closet) (bariera-900-left) (bariera-900-middle) (bariera-1200-corner) (bariera-1200-middle) (bariera-1200-middle2) (bariera-1200-middle3) (bariera-1200-right) (bariera-1400-middle) (door) (akiba-door) (akiba-door-window) (akiba-room-door) (coe-sofa2) (coe-sofa) (coe-demospace) (sakae-900-desk) (coe-800-shelf) (coe-1200-shelf) (coe-450-shelf) (coe-corner-shelf) (uchida-shelf-1100) (uchida-shelf-1300) (red-chair0) (trashbox) (coe-stairs) (coe-light) (askul-1600-desk) (fridge) (cupboard) (audio_shelf) (asplund-cabinet-4dan) (asplund-cabinet-4danbase) (shelf) (karimoku-kannonbiraki-cabinet) (tray) (bears-panel) (brown-board) (multibox-shelf) (single-arrow) (cardboard-box) (chair) (kettle) (knife) (sponge) (dining-table) (cup) (mug-cup) (ball) (book) (petbottle) (pockey) (plasmatv) (hrp2-rack) (hrp2-shelf) (coffee-cup-cup) (coffee-cup-saucer) (picaladder) (azuma-broom) (azuma-short-broom) (bamboo-broom) (broom) (elevator_call_panel) (elevator_inside_panel) (elevator_call_panel_eng2) (elevator_inside_panel_eng2) (chessboard-108-9x7) (chessboard-30-7x5) (chessboard-30-6x5) (chessboard-10-3x3) (foldable-desk) (gifuplastic-900-cart) (gifuplastic-720-cart) (darkgoldenrod-stairs) (misumi-handrail)))
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[655] trunk/EusLisp/models/load-irt-all-objects.l

From: <sn...@us...> - 2013-10-25 08:29:30

Revision: 655
          http://sourceforge.net/p/euslisp/code/655
Author:   snozawa
Date:     2013-10-25 08:29:24 +0000 (Fri, 25 Oct 2013)
Log Message:
-----------
add hitachi-18l-oven

Modified Paths:
--------------
    trunk/EusLisp/models/load-irt-all-objects.l

Modified: trunk/EusLisp/models/load-irt-all-objects.l
===================================================================
--- trunk/EusLisp/models/load-irt-all-objects.l	2013-10-11 09:14:17 UTC (rev 654)
+++ trunk/EusLisp/models/load-irt-all-objects.l	2013-10-25 08:29:24 UTC (rev 655)
@@ -392,6 +392,9 @@
 (warning-message 2 "loading 3t-600-clean-locker-object.l	(3t-600-clean-locker) for make model~%")
 (load "models/3t-600-clean-locker-object.l")
 
+(warning-message 2 "loading hitachi-18l-oven-object.l	(hitachi-18l-oven) for make model~%")
+(load "models/hitachi-18l-oven-object.l")
+
 (warning-message 2 "loading toshiba-microwave-oven-object.l	(toshiba-microwave-oven) for make model~%")
 (load "models/toshiba-microwave-oven-object.l")
 
@@ -420,4 +423,4 @@
 (load "models/bidirectional-arrow-object.l")
 ;;
 ;;
-(setq *irt-all-objects* '( (bidirectional-arrow) (arrow) (arrow-1000) (askul-gdh-cupboard) (askul-ntr-cupboard) (toshiba-clacio-refrigerator) (hitachi-fiesta-refrigerator) (refrigerator) (toshiba-microwave-oven) (3t-600-clean-locker) (kokuyo-450-locker) (washing-machine) (laundry-machine) (square-600-closet) (plus-900-square-desk) (plus-1700-desk) (plus-1800-desk) (plus-1800w-desk) (plus-2800-desk) (plus-7000-desk) (plus-6200-desk) (uchida-1500-desk) (uchida-1000-desk) (plus-1800-pdesk) (lion-1800-desk) (unknown-1200-desk) (uchida-1800-desk) (uchida-2400-desk) (uchida-monitor-leg) (uchida-desk) (toyama-900-desk) (desk) (askul-1200x700-desk) (askul-1400-desk) (askul-1200-desk) (askul-corner-desk) (askul-2700-desk) (nissen-1100-desk) (karimoku-1200-desk) (kokuyo-600-sidetable) (toyama-900-sidetable) (toyama-1800-sidetable) (fujitsu-42-plasmatv) (hitachi-42-plasmatv) (sharp-52-aquostv) (ideainternational-300-analog-clock) (casio-330-analog-clock) (maruman-55-analog-clock) (docomo-p504is) (sushi-cup) (tognana-pasta-dish) (frying-pan) (iron-table) (blue-clear-cup) (white-bread-salad-dish) (flower-tea-cup-dish) (toshiba-iron) (sharp-iron) (akiba-tv-desk) (akiba-desk) (itoki-900-closet) (itoki-900-shelf) (itoki-900-slide-shelf) (naiki-6door-closet) (bariera-900-left) (bariera-900-middle) (bariera-1200-corner) (bariera-1200-middle) (bariera-1200-middle2) (bariera-1200-middle3) (bariera-1200-right) (bariera-1400-middle) (door) (akiba-door) (akiba-door-window) (akiba-room-door) (coe-sofa2) (coe-sofa) (coe-demospace) (sakae-900-desk) (coe-800-shelf) (coe-1200-shelf) (coe-450-shelf) (coe-corner-shelf) (uchida-shelf-1100) (uchida-shelf-1300) (red-chair0) (trashbox) (coe-stairs) (coe-light) (askul-1600-desk) (fridge) (cupboard) (audio_shelf) (asplund-cabinet-4dan) (asplund-cabinet-4danbase) (shelf) (karimoku-kannonbiraki-cabinet) (tray) (bears-panel) (brown-board) (multibox-shelf) (single-arrow) (cardboard-box) (chair) (kettle) (knife) (sponge) (dining-table) (cup) (mug-cup) (ball) (book) (petbottle) (pockey) (plasmatv) (hrp2-rack) (hrp2-shelf) (coffee-cup-cup) (coffee-cup-saucer) (picaladder) (azuma-broom) (azuma-short-broom) (bamboo-broom) (broom) (elevator_call_panel) (elevator_inside_panel) (elevator_call_panel_eng2) (elevator_inside_panel_eng2) (chessboard-108-9x7) (chessboard-30-7x5) (chessboard-30-6x5) (chessboard-10-3x3) (foldable-desk) (gifuplastic-900-cart) (gifuplastic-720-cart) (darkgoldenrod-stairs) (misumi-handrail)))
\ No newline at end of file
+(setq *irt-all-objects* '( (bidirectional-arrow) (arrow) (arrow-1000) (askul-gdh-cupboard) (askul-ntr-cupboard) (toshiba-clacio-refrigerator) (hitachi-fiesta-refrigerator) (refrigerator) (toshiba-microwave-oven) (hitachi-18l-oven) (3t-600-clean-locker) (kokuyo-450-locker) (washing-machine) (laundry-machine) (square-600-closet) (plus-900-square-desk) (plus-1700-desk) (plus-1800-desk) (plus-1800w-desk) (plus-2800-desk) (plus-7000-desk) (plus-6200-desk) (uchida-1500-desk) (uchida-1000-desk) (plus-1800-pdesk) (lion-1800-desk) (unknown-1200-desk) (uchida-1800-desk) (uchida-2400-desk) (uchida-monitor-leg) (uchida-desk) (toyama-900-desk) (desk) (askul-1200x700-desk) (askul-1400-desk) (askul-1200-desk) (askul-corner-desk) (askul-2700-desk) (nissen-1100-desk) (karimoku-1200-desk) (kokuyo-600-sidetable) (toyama-900-sidetable) (toyama-1800-sidetable) (fujitsu-42-plasmatv) (hitachi-42-plasmatv) (sharp-52-aquostv) (ideainternational-300-analog-clock) (casio-330-analog-clock) (maruman-55-analog-clock) (docomo-p504is) (sushi-cup) (tognana-pasta-dish) (frying-pan) (iron-table) (blue-clear-cup) (white-bread-salad-dish) (flower-tea-cup-dish) (toshiba-iron) (sharp-iron) (akiba-tv-desk) (akiba-desk) (itoki-900-closet) (itoki-900-shelf) (itoki-900-slide-shelf) (naiki-6door-closet) (bariera-900-left) (bariera-900-middle) (bariera-1200-corner) (bariera-1200-middle) (bariera-1200-middle2) (bariera-1200-middle3) (bariera-1200-right) (bariera-1400-middle) (door) (akiba-door) (akiba-door-window) (akiba-room-door) (coe-sofa2) (coe-sofa) (coe-demospace) (sakae-900-desk) (coe-800-shelf) (coe-1200-shelf) (coe-450-shelf) (coe-corner-shelf) (uchida-shelf-1100) (uchida-shelf-1300) (red-chair0) (trashbox) (coe-stairs) (coe-light) (askul-1600-desk) (fridge) (cupboard) (audio_shelf) (asplund-cabinet-4dan) (asplund-cabinet-4danbase) (shelf) (karimoku-kannonbiraki-cabinet) (tray) (bears-panel) (brown-board) (multibox-shelf) (single-arrow) (cardboard-box) (chair) (kettle) (knife) (sponge) (dining-table) (cup) (mug-cup) (ball) (book) (petbottle) (pockey) (plasmatv) (hrp2-rack) (hrp2-shelf) (coffee-cup-cup) (coffee-cup-saucer) (picaladder) (azuma-broom) (azuma-short-broom) (bamboo-broom) (broom) (elevator_call_panel) (elevator_inside_panel) (elevator_call_panel_eng2) (elevator_inside_panel_eng2) (chessboard-108-9x7) (chessboard-30-7x5) (chessboard-30-6x5) (chessboard-10-3x3) (foldable-desk) (gifuplastic-900-cart) (gifuplastic-720-cart) (darkgoldenrod-stairs) (misumi-handrail)))
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[654] trunk/EusLisp/models/hitachi-18l-oven-object.l

From: <ky...@us...> - 2013-10-11 09:14:25

Revision: 654
          http://sourceforge.net/p/euslisp/code/654
Author:   kyouhei
Date:     2013-10-11 09:14:17 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
add hitachi-18l-oven

Added Paths:
-----------
    trunk/EusLisp/models/hitachi-18l-oven-object.l

Added: trunk/EusLisp/models/hitachi-18l-oven-object.l
===================================================================
--- trunk/EusLisp/models/hitachi-18l-oven-object.l	                        (rev 0)
+++ trunk/EusLisp/models/hitachi-18l-oven-object.l	2013-10-11 09:14:17 UTC (rev 654)
@@ -0,0 +1,176 @@
+;;
+;; DO NOT EDIT THIS FILE
+;; this file is automatically generated from euslisp+euslib version 
+;;
+;;
+(defclass hitachi-18l-oven-object
+  :super cascaded-link
+  :slots (sensors
+         handle0
+         joint0 ))
+(defmethod hitachi-18l-oven-object
+  (:init
+   (&rest args &key (name "hitachi-18l-oven") (pos (float-vector 0 0 0)) (rot (unit-matrix 3)) &allow-other-keys)
+   (let (c bc
+         blink0 blink1
+                 )
+     (send-super* :init :name name args)
+
+     ;; definition of link
+
+     ;; definition of :root
+     (setq bc (list
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 170.0 285.0 270.0) (float-vector -170.0 285.0 270.0) (float-vector -170.0 185.0 270.0) (float-vector 170.0 185.0 270.0)))
+         (instance face :init :vertices (list (float-vector -170.0 285.0 0.0) (float-vector 170.0 285.0 0.0) (float-vector 170.0 185.0 0.0) (float-vector -170.0 185.0 0.0)))
+         (instance face :init :vertices (list (float-vector 170.0 285.0 270.0) (float-vector 170.0 285.0 0.0) (float-vector -170.0 285.0 0.0) (float-vector -170.0 285.0 270.0)))
+         (instance face :init :vertices (list (float-vector 170.0 185.0 270.0) (float-vector 170.0 185.0 0.0) (float-vector 170.0 285.0 0.0) (float-vector 170.0 285.0 270.0)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 270.0) (float-vector -170.0 185.0 0.0) (float-vector 170.0 185.0 0.0) (float-vector 170.0 185.0 270.0)))
+         (instance face :init :vertices (list (float-vector -170.0 285.0 270.0) (float-vector -170.0 285.0 0.0) (float-vector -170.0 185.0 0.0) (float-vector -170.0 185.0 270.0)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 170.0 285.0 0.0) (float-vector -170.0 285.0 0.0) (float-vector -170.0 -185.0 0.0) (float-vector 170.0 -185.0 0.0)))
+         (instance face :init :vertices (list (float-vector -170.0 285.0 -35.0) (float-vector 170.0 285.0 -35.0) (float-vector 170.0 -185.0 -35.0) (float-vector -170.0 -185.0 -35.0)))
+         (instance face :init :vertices (list (float-vector 170.0 285.0 0.0) (float-vector 170.0 285.0 -35.0) (float-vector -170.0 285.0 -35.0) (float-vector -170.0 285.0 0.0)))
+         (instance face :init :vertices (list (float-vector 170.0 -185.0 0.0) (float-vector 170.0 -185.0 -35.0) (float-vector 170.0 285.0 -35.0) (float-vector 170.0 285.0 0.0)))
+         (instance face :init :vertices (list (float-vector -170.0 -185.0 0.0) (float-vector -170.0 -185.0 -35.0) (float-vector 170.0 -185.0 -35.0) (float-vector 170.0 -185.0 0.0)))
+         (instance face :init :vertices (list (float-vector -170.0 285.0 0.0) (float-vector -170.0 285.0 -35.0) (float-vector -170.0 -185.0 -35.0) (float-vector -170.0 -185.0 0.0)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 140.0 185.0 270.0) (float-vector -170.0 185.0 270.0) (float-vector -170.0 -185.0 270.0) (float-vector 140.0 -185.0 270.0)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 235.0) (float-vector 140.0 185.0 235.0) (float-vector 140.0 -185.0 235.0) (float-vector -170.0 -185.0 235.0)))
+         (instance face :init :vertices (list (float-vector 140.0 185.0 270.0) (float-vector 140.0 185.0 235.0) (float-vector -170.0 185.0 235.0) (float-vector -170.0 185.0 270.0)))
+         (instance face :init :vertices (list (float-vector 140.0 -185.0 270.0) (float-vector 140.0 -185.0 235.0) (float-vector 140.0 185.0 235.0) (float-vector 140.0 185.0 270.0)))
+         (instance face :init :vertices (list (float-vector -170.0 -185.0 270.0) (float-vector -170.0 -185.0 235.0) (float-vector 140.0 -185.0 235.0) (float-vector 140.0 -185.0 270.0)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 270.0) (float-vector -170.0 185.0 235.0) (float-vector -170.0 -185.0 235.0) (float-vector -170.0 -185.0 270.0)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 140.0 185.0 50.0) (float-vector -170.0 185.0 50.0) (float-vector -170.0 -185.0 50.0) (float-vector 140.0 -185.0 50.0)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 0.0) (float-vector 140.0 185.0 0.0) (float-vector 140.0 -185.0 0.0) (float-vector -170.0 -185.0 0.0)))
+         (instance face :init :vertices (list (float-vector 140.0 185.0 50.0) (float-vector 140.0 185.0 0.0) (float-vector -170.0 185.0 0.0) (float-vector -170.0 185.0 50.0)))
+         (instance face :init :vertices (list (float-vector 140.0 -185.0 50.0) (float-vector 140.0 -185.0 0.0) (float-vector 140.0 185.0 0.0) (float-vector 140.0 185.0 50.0)))
+         (instance face :init :vertices (list (float-vector -170.0 -185.0 50.0) (float-vector -170.0 -185.0 0.0) (float-vector 140.0 -185.0 0.0) (float-vector 140.0 -185.0 50.0)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 50.0) (float-vector -170.0 185.0 0.0) (float-vector -170.0 -185.0 0.0) (float-vector -170.0 -185.0 50.0)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector -130.0 145.0 235.5) (float-vector -170.0 145.0 235.5) (float-vector -170.0 -145.0 235.5) (float-vector -130.0 -145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 145.0 50.5) (float-vector -130.0 145.0 50.5) (float-vector -130.0 -145.0 50.5) (float-vector -170.0 -145.0 50.5)))
+         (instance face :init :vertices (list (float-vector -130.0 145.0 235.5) (float-vector -130.0 145.0 50.5) (float-vector -170.0 145.0 50.5) (float-vector -170.0 145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -130.0 -145.0 235.5) (float-vector -130.0 -145.0 50.5) (float-vector -130.0 145.0 50.5) (float-vector -130.0 145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 -145.0 235.5) (float-vector -170.0 -145.0 50.5) (float-vector -130.0 -145.0 50.5) (float-vector -130.0 -145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 145.0 235.5) (float-vector -170.0 145.0 50.5) (float-vector -170.0 -145.0 50.5) (float-vector -170.0 -145.0 235.5)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 140.0 185.0 235.5) (float-vector -170.0 185.0 235.5) (float-vector -170.0 145.0 235.5) (float-vector 140.0 145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 50.5) (float-vector 140.0 185.0 50.5) (float-vector 140.0 145.0 50.5) (float-vector -170.0 145.0 50.5)))
+         (instance face :init :vertices (list (float-vector 140.0 185.0 235.5) (float-vector 140.0 185.0 50.5) (float-vector -170.0 185.0 50.5) (float-vector -170.0 185.0 235.5)))
+         (instance face :init :vertices (list (float-vector 140.0 145.0 235.5) (float-vector 140.0 145.0 50.5) (float-vector 140.0 185.0 50.5) (float-vector 140.0 185.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 145.0 235.5) (float-vector -170.0 145.0 50.5) (float-vector 140.0 145.0 50.5) (float-vector 140.0 145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 235.5) (float-vector -170.0 185.0 50.5) (float-vector -170.0 145.0 50.5) (float-vector -170.0 145.0 235.5)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 140.0 -145.0 235.5) (float-vector -170.0 -145.0 235.5) (float-vector -170.0 -185.0 235.5) (float-vector 140.0 -185.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 -145.0 50.5) (float-vector 140.0 -145.0 50.5) (float-vector 140.0 -185.0 50.5) (float-vector -170.0 -185.0 50.5)))
+         (instance face :init :vertices (list (float-vector 140.0 -145.0 235.5) (float-vector 140.0 -145.0 50.5) (float-vector -170.0 -145.0 50.5) (float-vector -170.0 -145.0 235.5)))
+         (instance face :init :vertices (list (float-vector 140.0 -185.0 235.5) (float-vector 140.0 -185.0 50.5) (float-vector 140.0 -145.0 50.5) (float-vector 140.0 -145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 -185.0 235.5) (float-vector -170.0 -185.0 50.5) (float-vector 140.0 -185.0 50.5) (float-vector 140.0 -185.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 -145.0 235.5) (float-vector -170.0 -145.0 50.5) (float-vector -170.0 -185.0 50.5) (float-vector -170.0 -185.0 235.5)))
+       ))
+       ))
+     (dolist (b (cdr bc)) (send (car bc) :assoc b))
+     (send (elt bc 0) :set-color :gray60)
+     (send (elt bc 1) :set-color :gray10)
+     (send (elt bc 2) :set-color :gray60)
+     (send (elt bc 3) :set-color :gray60)
+     (send (elt bc 4) :set-color :gray60)
+     (send (elt bc 5) :set-color :gray60)
+     (send (elt bc 6) :set-color :gray60)
+     (setq blink0 (instance bodyset-link :init (make-cascoords) :bodies bc :name :root :weight 1 :centroid (float-vector 0.0 0.0 0.0) :inertia-tensor #2f((1.0 0.0 0.0) (0.0 1.0 0.0) (0.0 0.0 1.0))))
+
+     ;; definition of :hitachi-18l-oven-bodyset2
+     (setq bc (list
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector -7.5 355.0 -7.5) (float-vector -7.5 -15.0 -7.5) (float-vector -7.5 -15.0 262.5) (float-vector -7.5 355.0 262.5))
+                              :holes (list
+         (instance hole :init :vertices (list (float-vector -7.5 295.0 52.5) (float-vector -7.5 295.0 202.5) (float-vector -7.5 45.0 202.5) (float-vector -7.5 45.0 52.5)))
+))
+         (instance face :init :vertices (list (float-vector 22.5 -15.0 -7.5) (float-vector 22.5 -15.0 262.5) (float-vector -7.5 -15.0 262.5) (float-vector -7.5 -15.0 -7.5)))
+         (instance face :init :vertices (list (float-vector 22.5 355.0 -7.5) (float-vector 22.5 355.0 262.5) (float-vector 22.5 -15.0 262.5) (float-vector 22.5 -15.0 -7.5))
+                              :holes (list
+         (instance hole :init :vertices (list (float-vector 22.5 45.0 52.5) (float-vector 22.5 45.0 202.5) (float-vector 22.5 295.0 202.5) (float-vector 22.5 295.0 52.5)))
+))
+         (instance face :init :vertices (list (float-vector -7.5 355.0 262.5) (float-vector -7.5 -15.0 262.5) (float-vector 22.5 -15.0 262.5) (float-vector 22.5 355.0 262.5)))
+         (instance face :init :vertices (list (float-vector 22.5 355.0 -7.5) (float-vector 22.5 -15.0 -7.5) (float-vector -7.5 -15.0 -7.5) (float-vector -7.5 355.0 -7.5)))
+         (instance face :init :vertices (list (float-vector -7.5 355.0 -7.5) (float-vector -7.5 355.0 262.5) (float-vector 22.5 355.0 262.5) (float-vector 22.5 355.0 -7.5)))
+         (instance face :init :vertices (list (float-vector -7.5 45.0 52.5) (float-vector -7.5 45.0 202.5) (float-vector 22.5 45.0 202.5) (float-vector 22.5 45.0 52.5)))
+         (instance face :init :vertices (list (float-vector 22.5 295.0 202.5) (float-vector 22.5 45.0 202.5) (float-vector -7.5 45.0 202.5) (float-vector -7.5 295.0 202.5)))
+         (instance face :init :vertices (list (float-vector 22.5 295.0 52.5) (float-vector 22.5 295.0 202.5) (float-vector -7.5 295.0 202.5) (float-vector -7.5 295.0 52.5)))
+         (instance face :init :vertices (list (float-vector -7.5 295.0 52.5) (float-vector -7.5 45.0 52.5) (float-vector 22.5 45.0 52.5) (float-vector 22.5 295.0 52.5)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 22.0 300.0 207.5) (float-vector -7.0 300.0 207.5) (float-vector -7.0 40.0 207.5) (float-vector 22.0 40.0 207.5)))
+         (instance face :init :vertices (list (float-vector -7.0 300.0 47.5) (float-vector 22.0 300.0 47.5) (float-vector 22.0 40.0 47.5) (float-vector -7.0 40.0 47.5)))
+         (instance face :init :vertices (list (float-vector 22.0 300.0 207.5) (float-vector 22.0 300.0 47.5) (float-vector -7.0 300.0 47.5) (float-vector -7.0 300.0 207.5)))
+         (instance face :init :vertices (list (float-vector 22.0 40.0 207.5) (float-vector 22.0 40.0 47.5) (float-vector 22.0 300.0 47.5) (float-vector 22.0 300.0 207.5)))
+         (instance face :init :vertices (list (float-vector -7.0 40.0 207.5) (float-vector -7.0 40.0 47.5) (float-vector 22.0 40.0 47.5) (float-vector 22.0 40.0 207.5)))
+         (instance face :init :vertices (list (float-vector -7.0 300.0 207.5) (float-vector -7.0 300.0 47.5) (float-vector -7.0 40.0 47.5) (float-vector -7.0 40.0 207.5)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 22.5 -5.0 237.5) (float-vector 22.5 -5.0 257.5) (float-vector 22.5 110.0 257.5) (float-vector 22.5 110.0 237.5)))
+         (instance face :init :vertices (list (float-vector 22.5 445.0 237.5) (float-vector 22.5 330.0 237.5) (float-vector 22.5 330.0 257.5) (float-vector 22.5 445.0 257.5)))
+         (instance face :init :vertices (list (float-vector 62.5 -5.0 237.5) (float-vector 62.5 -5.0 257.5) (float-vector 22.5 -5.0 257.5) (float-vector 22.5 -5.0 237.5)))
+         (instance face :init :vertices (list (float-vector 62.5 445.0 237.5) (float-vector 62.5 445.0 257.5) (float-vector 62.5 -5.0 257.5) (float-vector 62.5 -5.0 237.5)))
+         (instance face :init :vertices (list (float-vector 22.5 445.0 257.5) (float-vector 22.5 330.0 257.5) (float-vector 52.5 330.0 257.5) (float-vector 52.5 110.0 257.5) (float-vector 22.5 110.0 257.5) (float-vector 22.5 -5.0 257.5) (float-vector 62.5 -5.0 257.5) (float-vector 62.5 445.0 257.5)))
+         (instance face :init :vertices (list (float-vector 62.5 445.0 237.5) (float-vector 62.5 -5.0 237.5) (float-vector 22.5 -5.0 237.5) (float-vector 22.5 110.0 237.5) (float-vector 52.5 110.0 237.5) (float-vector 52.5 330.0 237.5) (float-vector 22.5 330.0 237.5) (float-vector 22.5 445.0 237.5)))
+         (instance face :init :vertices (list (float-vector 22.5 445.0 237.5) (float-vector 22.5 445.0 257.5) (float-vector 62.5 445.0 257.5) (float-vector 62.5 445.0 237.5)))
+         (instance face :init :vertices (list (float-vector 52.5 110.0 237.5) (float-vector 22.5 110.0 237.5) (float-vector 22.5 110.0 257.5) (float-vector 52.5 110.0 257.5)))
+         (instance face :init :vertices (list (float-vector 52.5 330.0 257.5) (float-vector 22.5 330.0 257.5) (float-vector 22.5 330.0 237.5) (float-vector 52.5 330.0 237.5)))
+         (instance face :init :vertices (list (float-vector 52.5 330.0 237.5) (float-vector 52.5 110.0 237.5) (float-vector 52.5 110.0 257.5) (float-vector 52.5 330.0 257.5)))
+       ))
+       ))
+     (dolist (b (cdr bc)) (send (car bc) :assoc b))
+     (send (elt bc 0) :set-color :gray60)
+     (send (elt bc 1) :set-color :black)
+     (gl::transparent (elt bc 1) 0.8)
+     (send (elt bc 2) :set-color :gray60)
+     (setq blink1 (instance bodyset-link :init (make-cascoords) :bodies bc :name :hitachi-18l-oven-bodyset2 :weight 1 :centroid (float-vector 0.0 0.0 0.0) :inertia-tensor #2f((1.0 0.0 0.0) (0.0 1.0 0.0) (0.0 0.0 1.0))))
+
+     ;; definition of assoc
+     (send blink1 :newcoords (make-coords :pos (float-vector 147.5 -170.0 7.5) :rot #2f((1.0 0.0 0.0) (0.0 1.0 0.0) (0.0 0.0 1.0))))
+     (send blink0 :assoc blink1)
+     (send self :assoc blink0)
+
+     ;; definition of end-coords
+
+     ;; definition of joint
+
+     ;; definition of :door
+     (setq joint0 (instance rotational-joint :init
+			     :parent-link blink0 :child-link blink1 :name :door      :axis :y 
+			     :min    0.0 :max   90.0 :max-joint-velocity 5 :max-joint-torque 100))
+
+
+     ;; definition of :handle
+     (setq handle0 (make-cascoords :pos (float-vector 185.0 0.0 295.0) :rot #2f((0.0 1.0 0.0) (0.0 0.0 -1.0) (-1.0 0.0 0.0)) :name "door"))
+     (send self :assoc handle0)
+
+     ;; init-ending 
+     (setq links (list blink0 blink1))
+     (setq joint-list (list joint0))
+     (send self :init-ending)
+     (send self :move-to (make-coords :pos pos :rot rot))
+     (send-all links :worldcoords)
+
+     self))
+  (:cameras (&rest args)
+   (forward-message-to-all (list) args))
+
+  (:door (&rest args) (forward-message-to joint0 args))
+  (:handle (&rest args) (forward-message-to-all (list  handle0) args))
+  (:handle-door (&rest args) (forward-message-to handle0 args))
+  (:attention (&rest args) (forward-message-to-all (list ) args))
+  (:button (&rest args) (forward-message-to-all (list ) args))
+  )
+
+(defun hitachi-18l-oven (&rest args) (instance* hitachi-18l-oven-object :init args))
+;; (format *error-output* "(instance hitachi-18l-oven-object :init) for generating model~%")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[654] trunk/EusLisp/models/hitachi-18l-oven-object.l

From: <ky...@us...> - 2013-10-11 09:14:23

Revision: 654
          http://sourceforge.net/p/euslisp/code/654
Author:   kyouhei
Date:     2013-10-11 09:14:17 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
add hitachi-18l-oven

Added Paths:
-----------
    trunk/EusLisp/models/hitachi-18l-oven-object.l

Added: trunk/EusLisp/models/hitachi-18l-oven-object.l
===================================================================
--- trunk/EusLisp/models/hitachi-18l-oven-object.l	                        (rev 0)
+++ trunk/EusLisp/models/hitachi-18l-oven-object.l	2013-10-11 09:14:17 UTC (rev 654)
@@ -0,0 +1,176 @@
+;;
+;; DO NOT EDIT THIS FILE
+;; this file is automatically generated from euslisp+euslib version 
+;;
+;;
+(defclass hitachi-18l-oven-object
+  :super cascaded-link
+  :slots (sensors
+         handle0
+         joint0 ))
+(defmethod hitachi-18l-oven-object
+  (:init
+   (&rest args &key (name "hitachi-18l-oven") (pos (float-vector 0 0 0)) (rot (unit-matrix 3)) &allow-other-keys)
+   (let (c bc
+         blink0 blink1
+                 )
+     (send-super* :init :name name args)
+
+     ;; definition of link
+
+     ;; definition of :root
+     (setq bc (list
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 170.0 285.0 270.0) (float-vector -170.0 285.0 270.0) (float-vector -170.0 185.0 270.0) (float-vector 170.0 185.0 270.0)))
+         (instance face :init :vertices (list (float-vector -170.0 285.0 0.0) (float-vector 170.0 285.0 0.0) (float-vector 170.0 185.0 0.0) (float-vector -170.0 185.0 0.0)))
+         (instance face :init :vertices (list (float-vector 170.0 285.0 270.0) (float-vector 170.0 285.0 0.0) (float-vector -170.0 285.0 0.0) (float-vector -170.0 285.0 270.0)))
+         (instance face :init :vertices (list (float-vector 170.0 185.0 270.0) (float-vector 170.0 185.0 0.0) (float-vector 170.0 285.0 0.0) (float-vector 170.0 285.0 270.0)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 270.0) (float-vector -170.0 185.0 0.0) (float-vector 170.0 185.0 0.0) (float-vector 170.0 185.0 270.0)))
+         (instance face :init :vertices (list (float-vector -170.0 285.0 270.0) (float-vector -170.0 285.0 0.0) (float-vector -170.0 185.0 0.0) (float-vector -170.0 185.0 270.0)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 170.0 285.0 0.0) (float-vector -170.0 285.0 0.0) (float-vector -170.0 -185.0 0.0) (float-vector 170.0 -185.0 0.0)))
+         (instance face :init :vertices (list (float-vector -170.0 285.0 -35.0) (float-vector 170.0 285.0 -35.0) (float-vector 170.0 -185.0 -35.0) (float-vector -170.0 -185.0 -35.0)))
+         (instance face :init :vertices (list (float-vector 170.0 285.0 0.0) (float-vector 170.0 285.0 -35.0) (float-vector -170.0 285.0 -35.0) (float-vector -170.0 285.0 0.0)))
+         (instance face :init :vertices (list (float-vector 170.0 -185.0 0.0) (float-vector 170.0 -185.0 -35.0) (float-vector 170.0 285.0 -35.0) (float-vector 170.0 285.0 0.0)))
+         (instance face :init :vertices (list (float-vector -170.0 -185.0 0.0) (float-vector -170.0 -185.0 -35.0) (float-vector 170.0 -185.0 -35.0) (float-vector 170.0 -185.0 0.0)))
+         (instance face :init :vertices (list (float-vector -170.0 285.0 0.0) (float-vector -170.0 285.0 -35.0) (float-vector -170.0 -185.0 -35.0) (float-vector -170.0 -185.0 0.0)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 140.0 185.0 270.0) (float-vector -170.0 185.0 270.0) (float-vector -170.0 -185.0 270.0) (float-vector 140.0 -185.0 270.0)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 235.0) (float-vector 140.0 185.0 235.0) (float-vector 140.0 -185.0 235.0) (float-vector -170.0 -185.0 235.0)))
+         (instance face :init :vertices (list (float-vector 140.0 185.0 270.0) (float-vector 140.0 185.0 235.0) (float-vector -170.0 185.0 235.0) (float-vector -170.0 185.0 270.0)))
+         (instance face :init :vertices (list (float-vector 140.0 -185.0 270.0) (float-vector 140.0 -185.0 235.0) (float-vector 140.0 185.0 235.0) (float-vector 140.0 185.0 270.0)))
+         (instance face :init :vertices (list (float-vector -170.0 -185.0 270.0) (float-vector -170.0 -185.0 235.0) (float-vector 140.0 -185.0 235.0) (float-vector 140.0 -185.0 270.0)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 270.0) (float-vector -170.0 185.0 235.0) (float-vector -170.0 -185.0 235.0) (float-vector -170.0 -185.0 270.0)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 140.0 185.0 50.0) (float-vector -170.0 185.0 50.0) (float-vector -170.0 -185.0 50.0) (float-vector 140.0 -185.0 50.0)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 0.0) (float-vector 140.0 185.0 0.0) (float-vector 140.0 -185.0 0.0) (float-vector -170.0 -185.0 0.0)))
+         (instance face :init :vertices (list (float-vector 140.0 185.0 50.0) (float-vector 140.0 185.0 0.0) (float-vector -170.0 185.0 0.0) (float-vector -170.0 185.0 50.0)))
+         (instance face :init :vertices (list (float-vector 140.0 -185.0 50.0) (float-vector 140.0 -185.0 0.0) (float-vector 140.0 185.0 0.0) (float-vector 140.0 185.0 50.0)))
+         (instance face :init :vertices (list (float-vector -170.0 -185.0 50.0) (float-vector -170.0 -185.0 0.0) (float-vector 140.0 -185.0 0.0) (float-vector 140.0 -185.0 50.0)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 50.0) (float-vector -170.0 185.0 0.0) (float-vector -170.0 -185.0 0.0) (float-vector -170.0 -185.0 50.0)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector -130.0 145.0 235.5) (float-vector -170.0 145.0 235.5) (float-vector -170.0 -145.0 235.5) (float-vector -130.0 -145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 145.0 50.5) (float-vector -130.0 145.0 50.5) (float-vector -130.0 -145.0 50.5) (float-vector -170.0 -145.0 50.5)))
+         (instance face :init :vertices (list (float-vector -130.0 145.0 235.5) (float-vector -130.0 145.0 50.5) (float-vector -170.0 145.0 50.5) (float-vector -170.0 145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -130.0 -145.0 235.5) (float-vector -130.0 -145.0 50.5) (float-vector -130.0 145.0 50.5) (float-vector -130.0 145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 -145.0 235.5) (float-vector -170.0 -145.0 50.5) (float-vector -130.0 -145.0 50.5) (float-vector -130.0 -145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 145.0 235.5) (float-vector -170.0 145.0 50.5) (float-vector -170.0 -145.0 50.5) (float-vector -170.0 -145.0 235.5)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 140.0 185.0 235.5) (float-vector -170.0 185.0 235.5) (float-vector -170.0 145.0 235.5) (float-vector 140.0 145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 50.5) (float-vector 140.0 185.0 50.5) (float-vector 140.0 145.0 50.5) (float-vector -170.0 145.0 50.5)))
+         (instance face :init :vertices (list (float-vector 140.0 185.0 235.5) (float-vector 140.0 185.0 50.5) (float-vector -170.0 185.0 50.5) (float-vector -170.0 185.0 235.5)))
+         (instance face :init :vertices (list (float-vector 140.0 145.0 235.5) (float-vector 140.0 145.0 50.5) (float-vector 140.0 185.0 50.5) (float-vector 140.0 185.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 145.0 235.5) (float-vector -170.0 145.0 50.5) (float-vector 140.0 145.0 50.5) (float-vector 140.0 145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 185.0 235.5) (float-vector -170.0 185.0 50.5) (float-vector -170.0 145.0 50.5) (float-vector -170.0 145.0 235.5)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 140.0 -145.0 235.5) (float-vector -170.0 -145.0 235.5) (float-vector -170.0 -185.0 235.5) (float-vector 140.0 -185.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 -145.0 50.5) (float-vector 140.0 -145.0 50.5) (float-vector 140.0 -185.0 50.5) (float-vector -170.0 -185.0 50.5)))
+         (instance face :init :vertices (list (float-vector 140.0 -145.0 235.5) (float-vector 140.0 -145.0 50.5) (float-vector -170.0 -145.0 50.5) (float-vector -170.0 -145.0 235.5)))
+         (instance face :init :vertices (list (float-vector 140.0 -185.0 235.5) (float-vector 140.0 -185.0 50.5) (float-vector 140.0 -145.0 50.5) (float-vector 140.0 -145.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 -185.0 235.5) (float-vector -170.0 -185.0 50.5) (float-vector 140.0 -185.0 50.5) (float-vector 140.0 -185.0 235.5)))
+         (instance face :init :vertices (list (float-vector -170.0 -145.0 235.5) (float-vector -170.0 -145.0 50.5) (float-vector -170.0 -185.0 50.5) (float-vector -170.0 -185.0 235.5)))
+       ))
+       ))
+     (dolist (b (cdr bc)) (send (car bc) :assoc b))
+     (send (elt bc 0) :set-color :gray60)
+     (send (elt bc 1) :set-color :gray10)
+     (send (elt bc 2) :set-color :gray60)
+     (send (elt bc 3) :set-color :gray60)
+     (send (elt bc 4) :set-color :gray60)
+     (send (elt bc 5) :set-color :gray60)
+     (send (elt bc 6) :set-color :gray60)
+     (setq blink0 (instance bodyset-link :init (make-cascoords) :bodies bc :name :root :weight 1 :centroid (float-vector 0.0 0.0 0.0) :inertia-tensor #2f((1.0 0.0 0.0) (0.0 1.0 0.0) (0.0 0.0 1.0))))
+
+     ;; definition of :hitachi-18l-oven-bodyset2
+     (setq bc (list
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector -7.5 355.0 -7.5) (float-vector -7.5 -15.0 -7.5) (float-vector -7.5 -15.0 262.5) (float-vector -7.5 355.0 262.5))
+                              :holes (list
+         (instance hole :init :vertices (list (float-vector -7.5 295.0 52.5) (float-vector -7.5 295.0 202.5) (float-vector -7.5 45.0 202.5) (float-vector -7.5 45.0 52.5)))
+))
+         (instance face :init :vertices (list (float-vector 22.5 -15.0 -7.5) (float-vector 22.5 -15.0 262.5) (float-vector -7.5 -15.0 262.5) (float-vector -7.5 -15.0 -7.5)))
+         (instance face :init :vertices (list (float-vector 22.5 355.0 -7.5) (float-vector 22.5 355.0 262.5) (float-vector 22.5 -15.0 262.5) (float-vector 22.5 -15.0 -7.5))
+                              :holes (list
+         (instance hole :init :vertices (list (float-vector 22.5 45.0 52.5) (float-vector 22.5 45.0 202.5) (float-vector 22.5 295.0 202.5) (float-vector 22.5 295.0 52.5)))
+))
+         (instance face :init :vertices (list (float-vector -7.5 355.0 262.5) (float-vector -7.5 -15.0 262.5) (float-vector 22.5 -15.0 262.5) (float-vector 22.5 355.0 262.5)))
+         (instance face :init :vertices (list (float-vector 22.5 355.0 -7.5) (float-vector 22.5 -15.0 -7.5) (float-vector -7.5 -15.0 -7.5) (float-vector -7.5 355.0 -7.5)))
+         (instance face :init :vertices (list (float-vector -7.5 355.0 -7.5) (float-vector -7.5 355.0 262.5) (float-vector 22.5 355.0 262.5) (float-vector 22.5 355.0 -7.5)))
+         (instance face :init :vertices (list (float-vector -7.5 45.0 52.5) (float-vector -7.5 45.0 202.5) (float-vector 22.5 45.0 202.5) (float-vector 22.5 45.0 52.5)))
+         (instance face :init :vertices (list (float-vector 22.5 295.0 202.5) (float-vector 22.5 45.0 202.5) (float-vector -7.5 45.0 202.5) (float-vector -7.5 295.0 202.5)))
+         (instance face :init :vertices (list (float-vector 22.5 295.0 52.5) (float-vector 22.5 295.0 202.5) (float-vector -7.5 295.0 202.5) (float-vector -7.5 295.0 52.5)))
+         (instance face :init :vertices (list (float-vector -7.5 295.0 52.5) (float-vector -7.5 45.0 52.5) (float-vector 22.5 45.0 52.5) (float-vector 22.5 295.0 52.5)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 22.0 300.0 207.5) (float-vector -7.0 300.0 207.5) (float-vector -7.0 40.0 207.5) (float-vector 22.0 40.0 207.5)))
+         (instance face :init :vertices (list (float-vector -7.0 300.0 47.5) (float-vector 22.0 300.0 47.5) (float-vector 22.0 40.0 47.5) (float-vector -7.0 40.0 47.5)))
+         (instance face :init :vertices (list (float-vector 22.0 300.0 207.5) (float-vector 22.0 300.0 47.5) (float-vector -7.0 300.0 47.5) (float-vector -7.0 300.0 207.5)))
+         (instance face :init :vertices (list (float-vector 22.0 40.0 207.5) (float-vector 22.0 40.0 47.5) (float-vector 22.0 300.0 47.5) (float-vector 22.0 300.0 207.5)))
+         (instance face :init :vertices (list (float-vector -7.0 40.0 207.5) (float-vector -7.0 40.0 47.5) (float-vector 22.0 40.0 47.5) (float-vector 22.0 40.0 207.5)))
+         (instance face :init :vertices (list (float-vector -7.0 300.0 207.5) (float-vector -7.0 300.0 47.5) (float-vector -7.0 40.0 47.5) (float-vector -7.0 40.0 207.5)))
+       ))
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 22.5 -5.0 237.5) (float-vector 22.5 -5.0 257.5) (float-vector 22.5 110.0 257.5) (float-vector 22.5 110.0 237.5)))
+         (instance face :init :vertices (list (float-vector 22.5 445.0 237.5) (float-vector 22.5 330.0 237.5) (float-vector 22.5 330.0 257.5) (float-vector 22.5 445.0 257.5)))
+         (instance face :init :vertices (list (float-vector 62.5 -5.0 237.5) (float-vector 62.5 -5.0 257.5) (float-vector 22.5 -5.0 257.5) (float-vector 22.5 -5.0 237.5)))
+         (instance face :init :vertices (list (float-vector 62.5 445.0 237.5) (float-vector 62.5 445.0 257.5) (float-vector 62.5 -5.0 257.5) (float-vector 62.5 -5.0 237.5)))
+         (instance face :init :vertices (list (float-vector 22.5 445.0 257.5) (float-vector 22.5 330.0 257.5) (float-vector 52.5 330.0 257.5) (float-vector 52.5 110.0 257.5) (float-vector 22.5 110.0 257.5) (float-vector 22.5 -5.0 257.5) (float-vector 62.5 -5.0 257.5) (float-vector 62.5 445.0 257.5)))
+         (instance face :init :vertices (list (float-vector 62.5 445.0 237.5) (float-vector 62.5 -5.0 237.5) (float-vector 22.5 -5.0 237.5) (float-vector 22.5 110.0 237.5) (float-vector 52.5 110.0 237.5) (float-vector 52.5 330.0 237.5) (float-vector 22.5 330.0 237.5) (float-vector 22.5 445.0 237.5)))
+         (instance face :init :vertices (list (float-vector 22.5 445.0 237.5) (float-vector 22.5 445.0 257.5) (float-vector 62.5 445.0 257.5) (float-vector 62.5 445.0 237.5)))
+         (instance face :init :vertices (list (float-vector 52.5 110.0 237.5) (float-vector 22.5 110.0 237.5) (float-vector 22.5 110.0 257.5) (float-vector 52.5 110.0 257.5)))
+         (instance face :init :vertices (list (float-vector 52.5 330.0 257.5) (float-vector 22.5 330.0 257.5) (float-vector 22.5 330.0 237.5) (float-vector 52.5 330.0 237.5)))
+         (instance face :init :vertices (list (float-vector 52.5 330.0 237.5) (float-vector 52.5 110.0 237.5) (float-vector 52.5 110.0 257.5) (float-vector 52.5 330.0 257.5)))
+       ))
+       ))
+     (dolist (b (cdr bc)) (send (car bc) :assoc b))
+     (send (elt bc 0) :set-color :gray60)
+     (send (elt bc 1) :set-color :black)
+     (gl::transparent (elt bc 1) 0.8)
+     (send (elt bc 2) :set-color :gray60)
+     (setq blink1 (instance bodyset-link :init (make-cascoords) :bodies bc :name :hitachi-18l-oven-bodyset2 :weight 1 :centroid (float-vector 0.0 0.0 0.0) :inertia-tensor #2f((1.0 0.0 0.0) (0.0 1.0 0.0) (0.0 0.0 1.0))))
+
+     ;; definition of assoc
+     (send blink1 :newcoords (make-coords :pos (float-vector 147.5 -170.0 7.5) :rot #2f((1.0 0.0 0.0) (0.0 1.0 0.0) (0.0 0.0 1.0))))
+     (send blink0 :assoc blink1)
+     (send self :assoc blink0)
+
+     ;; definition of end-coords
+
+     ;; definition of joint
+
+     ;; definition of :door
+     (setq joint0 (instance rotational-joint :init
+			     :parent-link blink0 :child-link blink1 :name :door      :axis :y 
+			     :min    0.0 :max   90.0 :max-joint-velocity 5 :max-joint-torque 100))
+
+
+     ;; definition of :handle
+     (setq handle0 (make-cascoords :pos (float-vector 185.0 0.0 295.0) :rot #2f((0.0 1.0 0.0) (0.0 0.0 -1.0) (-1.0 0.0 0.0)) :name "door"))
+     (send self :assoc handle0)
+
+     ;; init-ending 
+     (setq links (list blink0 blink1))
+     (setq joint-list (list joint0))
+     (send self :init-ending)
+     (send self :move-to (make-coords :pos pos :rot rot))
+     (send-all links :worldcoords)
+
+     self))
+  (:cameras (&rest args)
+   (forward-message-to-all (list) args))
+
+  (:door (&rest args) (forward-message-to joint0 args))
+  (:handle (&rest args) (forward-message-to-all (list  handle0) args))
+  (:handle-door (&rest args) (forward-message-to handle0 args))
+  (:attention (&rest args) (forward-message-to-all (list ) args))
+  (:button (&rest args) (forward-message-to-all (list ) args))
+  )
+
+(defun hitachi-18l-oven (&rest args) (instance* hitachi-18l-oven-object :init args))
+;; (format *error-output* "(instance hitachi-18l-oven-object :init) for generating model~%")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[653] trunk/EusLisp/models

From: <sn...@us...> - 2013-09-25 09:37:15

Revision: 653
          http://sourceforge.net/p/euslisp/code/653
Author:   snozawa
Date:     2013-09-25 09:37:07 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
add misumi-handrail and darkgoldenrod-stairs

Modified Paths:
--------------
    trunk/EusLisp/models/load-irt-all-objects.l

Added Paths:
-----------
    trunk/EusLisp/models/darkgoldenrod-stairs-object.l
    trunk/EusLisp/models/misumi-handrail-object.l

Added: trunk/EusLisp/models/darkgoldenrod-stairs-object.l
===================================================================
--- trunk/EusLisp/models/darkgoldenrod-stairs-object.l	                        (rev 0)
+++ trunk/EusLisp/models/darkgoldenrod-stairs-object.l	2013-09-25 09:37:07 UTC (rev 653)
@@ -0,0 +1,68 @@
+;;
+;; DO NOT EDIT THIS FILE
+;; this file is automatically generated from euslisp+euslib version 
+;;
+;;
+(defclass darkgoldenrod-stairs-object
+  :super cascaded-link
+  :slots (sensors
+         ))
+(defmethod darkgoldenrod-stairs-object
+  (:init
+   (&rest args &key (name "darkgoldenrod-stairs") (pos (float-vector 0 0 0)) (rot (unit-matrix 3)) &allow-other-keys)
+   (let (c bc
+         blink0
+                 )
+     (send-super* :init :name name args)
+
+     ;; definition of link
+
+     ;; definition of :stairs-link
+     (setq bc (list
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 1200.0 300.0 410.0) (float-vector 900.0 300.0 410.0) (float-vector 900.0 -300.0 410.0) (float-vector 1200.0 -300.0 410.0)))
+         (instance face :init :vertices (list (float-vector 900.0 300.0 410.0) (float-vector 900.0 300.0 310.0) (float-vector 900.0 -300.0 310.0) (float-vector 900.0 -300.0 410.0)))
+         (instance face :init :vertices (list (float-vector 300.0 -300.0 210.0) (float-vector 300.0 300.0 210.0) (float-vector 300.0 300.0 110.0) (float-vector 300.0 -300.0 110.0)))
+         (instance face :init :vertices (list (float-vector 300.0 -300.0 210.0) (float-vector 600.0 -300.0 210.0) (float-vector 600.0 300.0 210.0) (float-vector 300.0 300.0 210.0)))
+         (instance face :init :vertices (list (float-vector 600.0 300.0 210.0) (float-vector 600.0 300.0 310.0) (float-vector 900.0 300.0 310.0) (float-vector 900.0 300.0 410.0) (float-vector 1200.0 300.0 410.0) (float-vector 1200.0 300.0 510.0) (float-vector 1600.0 300.0 510.0) (float-vector 1600.0 300.0 0.0) (float-vector 0.0 300.0 0.0) (float-vector 0.0 300.0 110.0) (float-vector 300.0 300.0 110.0) (float-vector 300.0 300.0 210.0)))
+         (instance face :init :vertices (list (float-vector 1600.0 -300.0 0.0) (float-vector 0.0 -300.0 0.0) (float-vector 0.0 300.0 0.0) (float-vector 1600.0 300.0 0.0)))
+         (instance face :init :vertices (list (float-vector 0.0 300.0 110.0) (float-vector 0.0 -300.0 110.0) (float-vector 300.0 -300.0 110.0) (float-vector 300.0 300.0 110.0)))
+         (instance face :init :vertices (list (float-vector 0.0 -300.0 0.0) (float-vector 0.0 -300.0 110.0) (float-vector 0.0 300.0 110.0) (float-vector 0.0 300.0 0.0)))
+         (instance face :init :vertices (list (float-vector 900.0 -300.0 310.0) (float-vector 600.0 -300.0 310.0) (float-vector 600.0 -300.0 210.0) (float-vector 300.0 -300.0 210.0) (float-vector 300.0 -300.0 110.0) (float-vector 0.0 -300.0 110.0) (float-vector 0.0 -300.0 0.0) (float-vector 1600.0 -300.0 0.0) (float-vector 1600.0 -300.0 510.0) (float-vector 1200.0 -300.0 510.0) (float-vector 1200.0 -300.0 410.0) (float-vector 900.0 -300.0 410.0)))
+         (instance face :init :vertices (list (float-vector 600.0 300.0 310.0) (float-vector 600.0 -300.0 310.0) (float-vector 900.0 -300.0 310.0) (float-vector 900.0 300.0 310.0)))
+         (instance face :init :vertices (list (float-vector 600.0 -300.0 310.0) (float-vector 600.0 300.0 310.0) (float-vector 600.0 300.0 210.0) (float-vector 600.0 -300.0 210.0)))
+         (instance face :init :vertices (list (float-vector 1200.0 300.0 510.0) (float-vector 1200.0 300.0 410.0) (float-vector 1200.0 -300.0 410.0) (float-vector 1200.0 -300.0 510.0)))
+         (instance face :init :vertices (list (float-vector 1600.0 -300.0 0.0) (float-vector 1600.0 300.0 0.0) (float-vector 1600.0 300.0 510.0) (float-vector 1600.0 -300.0 510.0)))
+         (instance face :init :vertices (list (float-vector 1600.0 300.0 510.0) (float-vector 1200.0 300.0 510.0) (float-vector 1200.0 -300.0 510.0) (float-vector 1600.0 -300.0 510.0)))
+       ))
+       ))
+     (dolist (b (cdr bc)) (send (car bc) :assoc b))
+     (send (elt bc 0) :set-color :darkgoldenrod)
+     (setq blink0 (instance bodyset-link :init (make-cascoords) :bodies bc :name :stairs-link :weight 5000 :centroid (float-vector 0.0 0.0 0.0) :inertia-tensor #2f((1.0 0.0 0.0) (0.0 1.0 0.0) (0.0 0.0 1.0))))
+
+     ;; definition of assoc
+     (send self :assoc blink0)
+
+     ;; definition of end-coords
+
+     ;; definition of joint
+
+
+     ;; init-ending 
+     (setq links (list blink0))
+     (setq joint-list (list))
+     (send self :init-ending)
+     (send self :move-to (make-coords :pos pos :rot rot))
+     (send-all links :worldcoords)
+
+     self))
+  (:cameras (&rest args)
+   (forward-message-to-all (list) args))
+
+  (:handle (&rest args) (forward-message-to-all (list ) args))
+  (:attention (&rest args) (forward-message-to-all (list ) args))
+  (:button (&rest args) (forward-message-to-all (list ) args))
+  )
+
+(defun darkgoldenrod-stairs (&rest args) (instance* darkgoldenrod-stairs-object :init args))
+;; (format *error-output* "(instance darkgoldenrod-stairs-object :init) for generating model~%")

Modified: trunk/EusLisp/models/load-irt-all-objects.l
===================================================================
--- trunk/EusLisp/models/load-irt-all-objects.l	2013-08-07 15:21:43 UTC (rev 652)
+++ trunk/EusLisp/models/load-irt-all-objects.l	2013-09-25 09:37:07 UTC (rev 653)
@@ -5,6 +5,12 @@
 ;;
 (provide :irt-all-object "models/load-irt-all-objects.l")
 
+(warning-message 2 "loading misumi-handrail-object.l	(misumi-handrail) for make model~%")
+(load "models/misumi-handrail-object.l")
+
+(warning-message 2 "loading darkgoldenrod-stairs-object.l	(darkgoldenrod-stairs) for make model~%")
+(load "models/darkgoldenrod-stairs-object.l")
+
 (warning-message 2 "loading gifuplastic-720-cart-object.l	(gifuplastic-720-cart) for make model~%")
 (load "models/gifuplastic-720-cart-object.l")
 
@@ -414,4 +420,4 @@
 (load "models/bidirectional-arrow-object.l")
 ;;
 ;;
-(setq *irt-all-objects* '( (bidirectional-arrow) (arrow) (arrow-1000) (askul-gdh-cupboard) (askul-ntr-cupboard) (toshiba-clacio-refrigerator) (hitachi-fiesta-refrigerator) (refrigerator) (toshiba-microwave-oven) (3t-600-clean-locker) (kokuyo-450-locker) (washing-machine) (laundry-machine) (square-600-closet) (plus-900-square-desk) (plus-1700-desk) (plus-1800-desk) (plus-1800w-desk) (plus-2800-desk) (plus-7000-desk) (plus-6200-desk) (uchida-1500-desk) (uchida-1000-desk) (plus-1800-pdesk) (lion-1800-desk) (unknown-1200-desk) (uchida-1800-desk) (uchida-2400-desk) (uchida-monitor-leg) (uchida-desk) (toyama-900-desk) (desk) (askul-1200x700-desk) (askul-1400-desk) (askul-1200-desk) (askul-corner-desk) (askul-2700-desk) (nissen-1100-desk) (karimoku-1200-desk) (kokuyo-600-sidetable) (toyama-900-sidetable) (toyama-1800-sidetable) (fujitsu-42-plasmatv) (hitachi-42-plasmatv) (sharp-52-aquostv) (ideainternational-300-analog-clock) (casio-330-analog-clock) (maruman-55-analog-clock) (docomo-p504is) (sushi-cup) (tognana-pasta-dish) (frying-pan) (iron-table) (blue-clear-cup) (white-bread-salad-dish) (flower-tea-cup-dish) (toshiba-iron) (sharp-iron) (akiba-tv-desk) (akiba-desk) (itoki-900-closet) (itoki-900-shelf) (itoki-900-slide-shelf) (naiki-6door-closet) (bariera-900-left) (bariera-900-middle) (bariera-1200-corner) (bariera-1200-middle) (bariera-1200-middle2) (bariera-1200-middle3) (bariera-1200-right) (bariera-1400-middle) (door) (akiba-door) (akiba-door-window) (akiba-room-door) (coe-sofa2) (coe-sofa) (coe-demospace) (sakae-900-desk) (coe-800-shelf) (coe-1200-shelf) (coe-450-shelf) (coe-corner-shelf) (uchida-shelf-1100) (uchida-shelf-1300) (red-chair0) (trashbox) (coe-stairs) (coe-light) (askul-1600-desk) (fridge) (cupboard) (audio_shelf) (asplund-cabinet-4dan) (asplund-cabinet-4danbase) (shelf) (karimoku-kannonbiraki-cabinet) (tray) (bears-panel) (brown-board) (multibox-shelf) (single-arrow) (cardboard-box) (chair) (kettle) (knife) (sponge) (dining-table) (cup) (mug-cup) (ball) (book) (petbottle) (pockey) (plasmatv) (hrp2-rack) (hrp2-shelf) (coffee-cup-cup) (coffee-cup-saucer) (picaladder) (azuma-broom) (azuma-short-broom) (bamboo-broom) (broom) (elevator_call_panel) (elevator_inside_panel) (elevator_call_panel_eng2) (elevator_inside_panel_eng2) (chessboard-108-9x7) (chessboard-30-7x5) (chessboard-30-6x5) (chessboard-10-3x3) (foldable-desk) (gifuplastic-900-cart) (gifuplastic-720-cart)))
\ No newline at end of file
+(setq *irt-all-objects* '( (bidirectional-arrow) (arrow) (arrow-1000) (askul-gdh-cupboard) (askul-ntr-cupboard) (toshiba-clacio-refrigerator) (hitachi-fiesta-refrigerator) (refrigerator) (toshiba-microwave-oven) (3t-600-clean-locker) (kokuyo-450-locker) (washing-machine) (laundry-machine) (square-600-closet) (plus-900-square-desk) (plus-1700-desk) (plus-1800-desk) (plus-1800w-desk) (plus-2800-desk) (plus-7000-desk) (plus-6200-desk) (uchida-1500-desk) (uchida-1000-desk) (plus-1800-pdesk) (lion-1800-desk) (unknown-1200-desk) (uchida-1800-desk) (uchida-2400-desk) (uchida-monitor-leg) (uchida-desk) (toyama-900-desk) (desk) (askul-1200x700-desk) (askul-1400-desk) (askul-1200-desk) (askul-corner-desk) (askul-2700-desk) (nissen-1100-desk) (karimoku-1200-desk) (kokuyo-600-sidetable) (toyama-900-sidetable) (toyama-1800-sidetable) (fujitsu-42-plasmatv) (hitachi-42-plasmatv) (sharp-52-aquostv) (ideainternational-300-analog-clock) (casio-330-analog-clock) (maruman-55-analog-clock) (docomo-p504is) (sushi-cup) (tognana-pasta-dish) (frying-pan) (iron-table) (blue-clear-cup) (white-bread-salad-dish) (flower-tea-cup-dish) (toshiba-iron) (sharp-iron) (akiba-tv-desk) (akiba-desk) (itoki-900-closet) (itoki-900-shelf) (itoki-900-slide-shelf) (naiki-6door-closet) (bariera-900-left) (bariera-900-middle) (bariera-1200-corner) (bariera-1200-middle) (bariera-1200-middle2) (bariera-1200-middle3) (bariera-1200-right) (bariera-1400-middle) (door) (akiba-door) (akiba-door-window) (akiba-room-door) (coe-sofa2) (coe-sofa) (coe-demospace) (sakae-900-desk) (coe-800-shelf) (coe-1200-shelf) (coe-450-shelf) (coe-corner-shelf) (uchida-shelf-1100) (uchida-shelf-1300) (red-chair0) (trashbox) (coe-stairs) (coe-light) (askul-1600-desk) (fridge) (cupboard) (audio_shelf) (asplund-cabinet-4dan) (asplund-cabinet-4danbase) (shelf) (karimoku-kannonbiraki-cabinet) (tray) (bears-panel) (brown-board) (multibox-shelf) (single-arrow) (cardboard-box) (chair) (kettle) (knife) (sponge) (dining-table) (cup) (mug-cup) (ball) (book) (petbottle) (pockey) (plasmatv) (hrp2-rack) (hrp2-shelf) (coffee-cup-cup) (coffee-cup-saucer) (picaladder) (azuma-broom) (azuma-short-broom) (bamboo-broom) (broom) (elevator_call_panel) (elevator_inside_panel) (elevator_call_panel_eng2) (elevator_inside_panel_eng2) (chessboard-108-9x7) (chessboard-30-7x5) (chessboard-30-6x5) (chessboard-10-3x3) (foldable-desk) (gifuplastic-900-cart) (gifuplastic-720-cart) (darkgoldenrod-stairs) (misumi-handrail)))
\ No newline at end of file

Added: trunk/EusLisp/models/misumi-handrail-object.l
===================================================================
--- trunk/EusLisp/models/misumi-handrail-object.l	                        (rev 0)
+++ trunk/EusLisp/models/misumi-handrail-object.l	2013-09-25 09:37:07 UTC (rev 653)
@@ -0,0 +1,84 @@
+;;
+;; DO NOT EDIT THIS FILE
+;; this file is automatically generated from euslisp+euslib version 
+;;
+;;
+(defclass misumi-handrail-object
+  :super cascaded-link
+  :slots (sensors
+         ))
+(defmethod misumi-handrail-object
+  (:init
+   (&rest args &key (name "misumi-handrail") (pos (float-vector 0 0 0)) (rot (unit-matrix 3)) &allow-other-keys)
+   (let (c bc
+         blink0
+                 )
+     (send-super* :init :name name args)
+
+     ;; definition of link
+
+     ;; definition of :handrail-link
+     (setq bc (list
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector -570.0 40.0 800.0) (float-vector 570.0 40.0 800.0) (float-vector 570.0 -40.0 800.0) (float-vector -570.0 -40.0 800.0)))
+         (instance face :init :vertices (list (float-vector 650.0 40.0 800.0) (float-vector 750.0 40.0 800.0) (float-vector 750.0 -40.0 800.0) (float-vector 650.0 -40.0 800.0)))
+         (instance face :init :vertices (list (float-vector -750.0 40.0 800.0) (float-vector -650.0 40.0 800.0) (float-vector -650.0 -40.0 800.0) (float-vector -750.0 -40.0 800.0)))
+         (instance face :init :vertices (list (float-vector 750.0 40.0 880.0) (float-vector -750.0 40.0 880.0) (float-vector -750.0 -40.0 880.0) (float-vector 750.0 -40.0 880.0)))
+         (instance face :init :vertices (list (float-vector 750.0 40.0 800.0) (float-vector 750.0 40.0 880.0) (float-vector 750.0 -40.0 880.0) (float-vector 750.0 -40.0 800.0)))
+         (instance face :init :vertices (list (float-vector -750.0 40.0 880.0) (float-vector -750.0 40.0 800.0) (float-vector -750.0 -40.0 800.0) (float-vector -750.0 -40.0 880.0)))
+         (instance face :init :vertices (list (float-vector -570.0 240.0 0.0) (float-vector -570.0 240.0 80.0) (float-vector -570.0 80.0 80.0) (float-vector -570.0 80.0 0.0)))
+         (instance face :init :vertices (list (float-vector -570.0 240.0 0.0) (float-vector -650.0 240.0 0.0) (float-vector -650.0 240.0 80.0) (float-vector -570.0 240.0 80.0)))
+         (instance face :init :vertices (list (float-vector -570.0 -240.0 0.0) (float-vector -570.0 -240.0 80.0) (float-vector -650.0 -240.0 80.0) (float-vector -650.0 -240.0 0.0)))
+         (instance face :init :vertices (list (float-vector -570.0 -240.0 0.0) (float-vector -570.0 -80.0 0.0) (float-vector -570.0 -80.0 80.0) (float-vector -570.0 -240.0 80.0)))
+         (instance face :init :vertices (list (float-vector -650.0 -240.0 80.0) (float-vector -650.0 -40.0 80.0) (float-vector -650.0 -40.0 800.0) (float-vector -650.0 40.0 800.0) (float-vector -650.0 40.0 80.0) (float-vector -650.0 240.0 80.0) (float-vector -650.0 240.0 0.0) (float-vector -650.0 -240.0 0.0)))
+         (instance face :init :vertices (list (float-vector -570.0 80.0 0.0) (float-vector -370.0 80.0 0.0) (float-vector -370.0 -80.0 0.0) (float-vector -570.0 -80.0 0.0) (float-vector -570.0 -240.0 0.0) (float-vector -650.0 -240.0 0.0) (float-vector -650.0 240.0 0.0) (float-vector -570.0 240.0 0.0)))
+         (instance face :init :vertices (list (float-vector -570.0 80.0 80.0) (float-vector -370.0 80.0 80.0) (float-vector -370.0 80.0 0.0) (float-vector -570.0 80.0 0.0)))
+         (instance face :init :vertices (list (float-vector -650.0 40.0 80.0) (float-vector -570.0 40.0 80.0) (float-vector -570.0 -40.0 80.0) (float-vector -650.0 -40.0 80.0) (float-vector -650.0 -240.0 80.0) (float-vector -570.0 -240.0 80.0) (float-vector -570.0 -80.0 80.0) (float-vector -370.0 -80.0 80.0) (float-vector -370.0 80.0 80.0) (float-vector -570.0 80.0 80.0) (float-vector -570.0 240.0 80.0) (float-vector -650.0 240.0 80.0)))
+         (instance face :init :vertices (list (float-vector -370.0 -80.0 80.0) (float-vector -370.0 -80.0 0.0) (float-vector -370.0 80.0 0.0) (float-vector -370.0 80.0 80.0)))
+         (instance face :init :vertices (list (float-vector -370.0 -80.0 0.0) (float-vector -370.0 -80.0 80.0) (float-vector -570.0 -80.0 80.0) (float-vector -570.0 -80.0 0.0)))
+         (instance face :init :vertices (list (float-vector -570.0 -40.0 80.0) (float-vector -570.0 -40.0 800.0) (float-vector 570.0 -40.0 800.0) (float-vector 570.0 -40.0 80.0) (float-vector 650.0 -40.0 80.0) (float-vector 650.0 -40.0 800.0) (float-vector 750.0 -40.0 800.0) (float-vector 750.0 -40.0 880.0) (float-vector -750.0 -40.0 880.0) (float-vector -750.0 -40.0 800.0) (float-vector -650.0 -40.0 800.0) (float-vector -650.0 -40.0 80.0)))
+         (instance face :init :vertices (list (float-vector -570.0 40.0 800.0) (float-vector -570.0 40.0 80.0) (float-vector -650.0 40.0 80.0) (float-vector -650.0 40.0 800.0) (float-vector -750.0 40.0 800.0) (float-vector -750.0 40.0 880.0) (float-vector 750.0 40.0 880.0) (float-vector 750.0 40.0 800.0) (float-vector 650.0 40.0 800.0) (float-vector 650.0 40.0 80.0) (float-vector 570.0 40.0 80.0) (float-vector 570.0 40.0 800.0)))
+         (instance face :init :vertices (list (float-vector -570.0 40.0 80.0) (float-vector -570.0 40.0 800.0) (float-vector -570.0 -40.0 800.0) (float-vector -570.0 -40.0 80.0)))
+         (instance face :init :vertices (list (float-vector 570.0 40.0 80.0) (float-vector 570.0 -40.0 80.0) (float-vector 570.0 -40.0 800.0) (float-vector 570.0 40.0 800.0)))
+         (instance face :init :vertices (list (float-vector 370.0 -80.0 0.0) (float-vector 370.0 -80.0 80.0) (float-vector 370.0 80.0 80.0) (float-vector 370.0 80.0 0.0)))
+         (instance face :init :vertices (list (float-vector 370.0 -80.0 0.0) (float-vector 570.0 -80.0 0.0) (float-vector 570.0 -80.0 80.0) (float-vector 370.0 -80.0 80.0)))
+         (instance face :init :vertices (list (float-vector 570.0 -80.0 80.0) (float-vector 570.0 -240.0 80.0) (float-vector 650.0 -240.0 80.0) (float-vector 650.0 -40.0 80.0) (float-vector 570.0 -40.0 80.0) (float-vector 570.0 40.0 80.0) (float-vector 650.0 40.0 80.0) (float-vector 650.0 240.0 80.0) (float-vector 570.0 240.0 80.0) (float-vector 570.0 80.0 80.0) (float-vector 370.0 80.0 80.0) (float-vector 370.0 -80.0 80.0)))
+         (instance face :init :vertices (list (float-vector 570.0 80.0 80.0) (float-vector 570.0 80.0 0.0) (float-vector 370.0 80.0 0.0) (float-vector 370.0 80.0 80.0)))
+         (instance face :init :vertices (list (float-vector 570.0 80.0 0.0) (float-vector 570.0 240.0 0.0) (float-vector 650.0 240.0 0.0) (float-vector 650.0 -240.0 0.0) (float-vector 570.0 -240.0 0.0) (float-vector 570.0 -80.0 0.0) (float-vector 370.0 -80.0 0.0) (float-vector 370.0 80.0 0.0)))
+         (instance face :init :vertices (list (float-vector 570.0 -240.0 0.0) (float-vector 570.0 -240.0 80.0) (float-vector 570.0 -80.0 80.0) (float-vector 570.0 -80.0 0.0)))
+         (instance face :init :vertices (list (float-vector 570.0 240.0 80.0) (float-vector 570.0 240.0 0.0) (float-vector 570.0 80.0 0.0) (float-vector 570.0 80.0 80.0)))
+         (instance face :init :vertices (list (float-vector 650.0 -240.0 0.0) (float-vector 650.0 -240.0 80.0) (float-vector 570.0 -240.0 80.0) (float-vector 570.0 -240.0 0.0)))
+         (instance face :init :vertices (list (float-vector 650.0 240.0 80.0) (float-vector 650.0 240.0 0.0) (float-vector 570.0 240.0 0.0) (float-vector 570.0 240.0 80.0)))
+         (instance face :init :vertices (list (float-vector 650.0 240.0 0.0) (float-vector 650.0 240.0 80.0) (float-vector 650.0 40.0 80.0) (float-vector 650.0 40.0 800.0) (float-vector 650.0 -40.0 800.0) (float-vector 650.0 -40.0 80.0) (float-vector 650.0 -240.0 80.0) (float-vector 650.0 -240.0 0.0)))
+       ))
+       ))
+     (dolist (b (cdr bc)) (send (car bc) :assoc b))
+     (send (elt bc 0) :set-color :darkgray)
+     (setq blink0 (instance bodyset-link :init (make-cascoords) :bodies bc :name :handrail-link :weight 1500 :centroid (float-vector 0.0 0.0 0.0) :inertia-tensor #2f((1.0 0.0 0.0) (0.0 1.0 0.0) (0.0 0.0 1.0))))
+
+     ;; definition of assoc
+     (send self :assoc blink0)
+
+     ;; definition of end-coords
+
+     ;; definition of joint
+
+
+     ;; init-ending 
+     (setq links (list blink0))
+     (setq joint-list (list))
+     (send self :init-ending)
+     (send self :move-to (make-coords :pos pos :rot rot))
+     (send-all links :worldcoords)
+
+     self))
+  (:cameras (&rest args)
+   (forward-message-to-all (list) args))
+
+  (:handle (&rest args) (forward-message-to-all (list ) args))
+  (:attention (&rest args) (forward-message-to-all (list ) args))
+  (:button (&rest args) (forward-message-to-all (list ) args))
+  )
+
+(defun misumi-handrail (&rest args) (instance* misumi-handrail-object :init args))
+;; (format *error-output* "(instance misumi-handrail-object :init) for generating model~%")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[653] trunk/EusLisp/models

From: <sn...@us...> - 2013-09-25 09:37:13

Revision: 653
          http://sourceforge.net/p/euslisp/code/653
Author:   snozawa
Date:     2013-09-25 09:37:07 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
add misumi-handrail and darkgoldenrod-stairs

Modified Paths:
--------------
    trunk/EusLisp/models/load-irt-all-objects.l

Added Paths:
-----------
    trunk/EusLisp/models/darkgoldenrod-stairs-object.l
    trunk/EusLisp/models/misumi-handrail-object.l

Added: trunk/EusLisp/models/darkgoldenrod-stairs-object.l
===================================================================
--- trunk/EusLisp/models/darkgoldenrod-stairs-object.l	                        (rev 0)
+++ trunk/EusLisp/models/darkgoldenrod-stairs-object.l	2013-09-25 09:37:07 UTC (rev 653)
@@ -0,0 +1,68 @@
+;;
+;; DO NOT EDIT THIS FILE
+;; this file is automatically generated from euslisp+euslib version 
+;;
+;;
+(defclass darkgoldenrod-stairs-object
+  :super cascaded-link
+  :slots (sensors
+         ))
+(defmethod darkgoldenrod-stairs-object
+  (:init
+   (&rest args &key (name "darkgoldenrod-stairs") (pos (float-vector 0 0 0)) (rot (unit-matrix 3)) &allow-other-keys)
+   (let (c bc
+         blink0
+                 )
+     (send-super* :init :name name args)
+
+     ;; definition of link
+
+     ;; definition of :stairs-link
+     (setq bc (list
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector 1200.0 300.0 410.0) (float-vector 900.0 300.0 410.0) (float-vector 900.0 -300.0 410.0) (float-vector 1200.0 -300.0 410.0)))
+         (instance face :init :vertices (list (float-vector 900.0 300.0 410.0) (float-vector 900.0 300.0 310.0) (float-vector 900.0 -300.0 310.0) (float-vector 900.0 -300.0 410.0)))
+         (instance face :init :vertices (list (float-vector 300.0 -300.0 210.0) (float-vector 300.0 300.0 210.0) (float-vector 300.0 300.0 110.0) (float-vector 300.0 -300.0 110.0)))
+         (instance face :init :vertices (list (float-vector 300.0 -300.0 210.0) (float-vector 600.0 -300.0 210.0) (float-vector 600.0 300.0 210.0) (float-vector 300.0 300.0 210.0)))
+         (instance face :init :vertices (list (float-vector 600.0 300.0 210.0) (float-vector 600.0 300.0 310.0) (float-vector 900.0 300.0 310.0) (float-vector 900.0 300.0 410.0) (float-vector 1200.0 300.0 410.0) (float-vector 1200.0 300.0 510.0) (float-vector 1600.0 300.0 510.0) (float-vector 1600.0 300.0 0.0) (float-vector 0.0 300.0 0.0) (float-vector 0.0 300.0 110.0) (float-vector 300.0 300.0 110.0) (float-vector 300.0 300.0 210.0)))
+         (instance face :init :vertices (list (float-vector 1600.0 -300.0 0.0) (float-vector 0.0 -300.0 0.0) (float-vector 0.0 300.0 0.0) (float-vector 1600.0 300.0 0.0)))
+         (instance face :init :vertices (list (float-vector 0.0 300.0 110.0) (float-vector 0.0 -300.0 110.0) (float-vector 300.0 -300.0 110.0) (float-vector 300.0 300.0 110.0)))
+         (instance face :init :vertices (list (float-vector 0.0 -300.0 0.0) (float-vector 0.0 -300.0 110.0) (float-vector 0.0 300.0 110.0) (float-vector 0.0 300.0 0.0)))
+         (instance face :init :vertices (list (float-vector 900.0 -300.0 310.0) (float-vector 600.0 -300.0 310.0) (float-vector 600.0 -300.0 210.0) (float-vector 300.0 -300.0 210.0) (float-vector 300.0 -300.0 110.0) (float-vector 0.0 -300.0 110.0) (float-vector 0.0 -300.0 0.0) (float-vector 1600.0 -300.0 0.0) (float-vector 1600.0 -300.0 510.0) (float-vector 1200.0 -300.0 510.0) (float-vector 1200.0 -300.0 410.0) (float-vector 900.0 -300.0 410.0)))
+         (instance face :init :vertices (list (float-vector 600.0 300.0 310.0) (float-vector 600.0 -300.0 310.0) (float-vector 900.0 -300.0 310.0) (float-vector 900.0 300.0 310.0)))
+         (instance face :init :vertices (list (float-vector 600.0 -300.0 310.0) (float-vector 600.0 300.0 310.0) (float-vector 600.0 300.0 210.0) (float-vector 600.0 -300.0 210.0)))
+         (instance face :init :vertices (list (float-vector 1200.0 300.0 510.0) (float-vector 1200.0 300.0 410.0) (float-vector 1200.0 -300.0 410.0) (float-vector 1200.0 -300.0 510.0)))
+         (instance face :init :vertices (list (float-vector 1600.0 -300.0 0.0) (float-vector 1600.0 300.0 0.0) (float-vector 1600.0 300.0 510.0) (float-vector 1600.0 -300.0 510.0)))
+         (instance face :init :vertices (list (float-vector 1600.0 300.0 510.0) (float-vector 1200.0 300.0 510.0) (float-vector 1200.0 -300.0 510.0) (float-vector 1600.0 -300.0 510.0)))
+       ))
+       ))
+     (dolist (b (cdr bc)) (send (car bc) :assoc b))
+     (send (elt bc 0) :set-color :darkgoldenrod)
+     (setq blink0 (instance bodyset-link :init (make-cascoords) :bodies bc :name :stairs-link :weight 5000 :centroid (float-vector 0.0 0.0 0.0) :inertia-tensor #2f((1.0 0.0 0.0) (0.0 1.0 0.0) (0.0 0.0 1.0))))
+
+     ;; definition of assoc
+     (send self :assoc blink0)
+
+     ;; definition of end-coords
+
+     ;; definition of joint
+
+
+     ;; init-ending 
+     (setq links (list blink0))
+     (setq joint-list (list))
+     (send self :init-ending)
+     (send self :move-to (make-coords :pos pos :rot rot))
+     (send-all links :worldcoords)
+
+     self))
+  (:cameras (&rest args)
+   (forward-message-to-all (list) args))
+
+  (:handle (&rest args) (forward-message-to-all (list ) args))
+  (:attention (&rest args) (forward-message-to-all (list ) args))
+  (:button (&rest args) (forward-message-to-all (list ) args))
+  )
+
+(defun darkgoldenrod-stairs (&rest args) (instance* darkgoldenrod-stairs-object :init args))
+;; (format *error-output* "(instance darkgoldenrod-stairs-object :init) for generating model~%")

Modified: trunk/EusLisp/models/load-irt-all-objects.l
===================================================================
--- trunk/EusLisp/models/load-irt-all-objects.l	2013-08-07 15:21:43 UTC (rev 652)
+++ trunk/EusLisp/models/load-irt-all-objects.l	2013-09-25 09:37:07 UTC (rev 653)
@@ -5,6 +5,12 @@
 ;;
 (provide :irt-all-object "models/load-irt-all-objects.l")
 
+(warning-message 2 "loading misumi-handrail-object.l	(misumi-handrail) for make model~%")
+(load "models/misumi-handrail-object.l")
+
+(warning-message 2 "loading darkgoldenrod-stairs-object.l	(darkgoldenrod-stairs) for make model~%")
+(load "models/darkgoldenrod-stairs-object.l")
+
 (warning-message 2 "loading gifuplastic-720-cart-object.l	(gifuplastic-720-cart) for make model~%")
 (load "models/gifuplastic-720-cart-object.l")
 
@@ -414,4 +420,4 @@
 (load "models/bidirectional-arrow-object.l")
 ;;
 ;;
-(setq *irt-all-objects* '( (bidirectional-arrow) (arrow) (arrow-1000) (askul-gdh-cupboard) (askul-ntr-cupboard) (toshiba-clacio-refrigerator) (hitachi-fiesta-refrigerator) (refrigerator) (toshiba-microwave-oven) (3t-600-clean-locker) (kokuyo-450-locker) (washing-machine) (laundry-machine) (square-600-closet) (plus-900-square-desk) (plus-1700-desk) (plus-1800-desk) (plus-1800w-desk) (plus-2800-desk) (plus-7000-desk) (plus-6200-desk) (uchida-1500-desk) (uchida-1000-desk) (plus-1800-pdesk) (lion-1800-desk) (unknown-1200-desk) (uchida-1800-desk) (uchida-2400-desk) (uchida-monitor-leg) (uchida-desk) (toyama-900-desk) (desk) (askul-1200x700-desk) (askul-1400-desk) (askul-1200-desk) (askul-corner-desk) (askul-2700-desk) (nissen-1100-desk) (karimoku-1200-desk) (kokuyo-600-sidetable) (toyama-900-sidetable) (toyama-1800-sidetable) (fujitsu-42-plasmatv) (hitachi-42-plasmatv) (sharp-52-aquostv) (ideainternational-300-analog-clock) (casio-330-analog-clock) (maruman-55-analog-clock) (docomo-p504is) (sushi-cup) (tognana-pasta-dish) (frying-pan) (iron-table) (blue-clear-cup) (white-bread-salad-dish) (flower-tea-cup-dish) (toshiba-iron) (sharp-iron) (akiba-tv-desk) (akiba-desk) (itoki-900-closet) (itoki-900-shelf) (itoki-900-slide-shelf) (naiki-6door-closet) (bariera-900-left) (bariera-900-middle) (bariera-1200-corner) (bariera-1200-middle) (bariera-1200-middle2) (bariera-1200-middle3) (bariera-1200-right) (bariera-1400-middle) (door) (akiba-door) (akiba-door-window) (akiba-room-door) (coe-sofa2) (coe-sofa) (coe-demospace) (sakae-900-desk) (coe-800-shelf) (coe-1200-shelf) (coe-450-shelf) (coe-corner-shelf) (uchida-shelf-1100) (uchida-shelf-1300) (red-chair0) (trashbox) (coe-stairs) (coe-light) (askul-1600-desk) (fridge) (cupboard) (audio_shelf) (asplund-cabinet-4dan) (asplund-cabinet-4danbase) (shelf) (karimoku-kannonbiraki-cabinet) (tray) (bears-panel) (brown-board) (multibox-shelf) (single-arrow) (cardboard-box) (chair) (kettle) (knife) (sponge) (dining-table) (cup) (mug-cup) (ball) (book) (petbottle) (pockey) (plasmatv) (hrp2-rack) (hrp2-shelf) (coffee-cup-cup) (coffee-cup-saucer) (picaladder) (azuma-broom) (azuma-short-broom) (bamboo-broom) (broom) (elevator_call_panel) (elevator_inside_panel) (elevator_call_panel_eng2) (elevator_inside_panel_eng2) (chessboard-108-9x7) (chessboard-30-7x5) (chessboard-30-6x5) (chessboard-10-3x3) (foldable-desk) (gifuplastic-900-cart) (gifuplastic-720-cart)))
\ No newline at end of file
+(setq *irt-all-objects* '( (bidirectional-arrow) (arrow) (arrow-1000) (askul-gdh-cupboard) (askul-ntr-cupboard) (toshiba-clacio-refrigerator) (hitachi-fiesta-refrigerator) (refrigerator) (toshiba-microwave-oven) (3t-600-clean-locker) (kokuyo-450-locker) (washing-machine) (laundry-machine) (square-600-closet) (plus-900-square-desk) (plus-1700-desk) (plus-1800-desk) (plus-1800w-desk) (plus-2800-desk) (plus-7000-desk) (plus-6200-desk) (uchida-1500-desk) (uchida-1000-desk) (plus-1800-pdesk) (lion-1800-desk) (unknown-1200-desk) (uchida-1800-desk) (uchida-2400-desk) (uchida-monitor-leg) (uchida-desk) (toyama-900-desk) (desk) (askul-1200x700-desk) (askul-1400-desk) (askul-1200-desk) (askul-corner-desk) (askul-2700-desk) (nissen-1100-desk) (karimoku-1200-desk) (kokuyo-600-sidetable) (toyama-900-sidetable) (toyama-1800-sidetable) (fujitsu-42-plasmatv) (hitachi-42-plasmatv) (sharp-52-aquostv) (ideainternational-300-analog-clock) (casio-330-analog-clock) (maruman-55-analog-clock) (docomo-p504is) (sushi-cup) (tognana-pasta-dish) (frying-pan) (iron-table) (blue-clear-cup) (white-bread-salad-dish) (flower-tea-cup-dish) (toshiba-iron) (sharp-iron) (akiba-tv-desk) (akiba-desk) (itoki-900-closet) (itoki-900-shelf) (itoki-900-slide-shelf) (naiki-6door-closet) (bariera-900-left) (bariera-900-middle) (bariera-1200-corner) (bariera-1200-middle) (bariera-1200-middle2) (bariera-1200-middle3) (bariera-1200-right) (bariera-1400-middle) (door) (akiba-door) (akiba-door-window) (akiba-room-door) (coe-sofa2) (coe-sofa) (coe-demospace) (sakae-900-desk) (coe-800-shelf) (coe-1200-shelf) (coe-450-shelf) (coe-corner-shelf) (uchida-shelf-1100) (uchida-shelf-1300) (red-chair0) (trashbox) (coe-stairs) (coe-light) (askul-1600-desk) (fridge) (cupboard) (audio_shelf) (asplund-cabinet-4dan) (asplund-cabinet-4danbase) (shelf) (karimoku-kannonbiraki-cabinet) (tray) (bears-panel) (brown-board) (multibox-shelf) (single-arrow) (cardboard-box) (chair) (kettle) (knife) (sponge) (dining-table) (cup) (mug-cup) (ball) (book) (petbottle) (pockey) (plasmatv) (hrp2-rack) (hrp2-shelf) (coffee-cup-cup) (coffee-cup-saucer) (picaladder) (azuma-broom) (azuma-short-broom) (bamboo-broom) (broom) (elevator_call_panel) (elevator_inside_panel) (elevator_call_panel_eng2) (elevator_inside_panel_eng2) (chessboard-108-9x7) (chessboard-30-7x5) (chessboard-30-6x5) (chessboard-10-3x3) (foldable-desk) (gifuplastic-900-cart) (gifuplastic-720-cart) (darkgoldenrod-stairs) (misumi-handrail)))
\ No newline at end of file

Added: trunk/EusLisp/models/misumi-handrail-object.l
===================================================================
--- trunk/EusLisp/models/misumi-handrail-object.l	                        (rev 0)
+++ trunk/EusLisp/models/misumi-handrail-object.l	2013-09-25 09:37:07 UTC (rev 653)
@@ -0,0 +1,84 @@
+;;
+;; DO NOT EDIT THIS FILE
+;; this file is automatically generated from euslisp+euslib version 
+;;
+;;
+(defclass misumi-handrail-object
+  :super cascaded-link
+  :slots (sensors
+         ))
+(defmethod misumi-handrail-object
+  (:init
+   (&rest args &key (name "misumi-handrail") (pos (float-vector 0 0 0)) (rot (unit-matrix 3)) &allow-other-keys)
+   (let (c bc
+         blink0
+                 )
+     (send-super* :init :name name args)
+
+     ;; definition of link
+
+     ;; definition of :handrail-link
+     (setq bc (list
+       (instance faceset :init :faces (list
+         (instance face :init :vertices (list (float-vector -570.0 40.0 800.0) (float-vector 570.0 40.0 800.0) (float-vector 570.0 -40.0 800.0) (float-vector -570.0 -40.0 800.0)))
+         (instance face :init :vertices (list (float-vector 650.0 40.0 800.0) (float-vector 750.0 40.0 800.0) (float-vector 750.0 -40.0 800.0) (float-vector 650.0 -40.0 800.0)))
+         (instance face :init :vertices (list (float-vector -750.0 40.0 800.0) (float-vector -650.0 40.0 800.0) (float-vector -650.0 -40.0 800.0) (float-vector -750.0 -40.0 800.0)))
+         (instance face :init :vertices (list (float-vector 750.0 40.0 880.0) (float-vector -750.0 40.0 880.0) (float-vector -750.0 -40.0 880.0) (float-vector 750.0 -40.0 880.0)))
+         (instance face :init :vertices (list (float-vector 750.0 40.0 800.0) (float-vector 750.0 40.0 880.0) (float-vector 750.0 -40.0 880.0) (float-vector 750.0 -40.0 800.0)))
+         (instance face :init :vertices (list (float-vector -750.0 40.0 880.0) (float-vector -750.0 40.0 800.0) (float-vector -750.0 -40.0 800.0) (float-vector -750.0 -40.0 880.0)))
+         (instance face :init :vertices (list (float-vector -570.0 240.0 0.0) (float-vector -570.0 240.0 80.0) (float-vector -570.0 80.0 80.0) (float-vector -570.0 80.0 0.0)))
+         (instance face :init :vertices (list (float-vector -570.0 240.0 0.0) (float-vector -650.0 240.0 0.0) (float-vector -650.0 240.0 80.0) (float-vector -570.0 240.0 80.0)))
+         (instance face :init :vertices (list (float-vector -570.0 -240.0 0.0) (float-vector -570.0 -240.0 80.0) (float-vector -650.0 -240.0 80.0) (float-vector -650.0 -240.0 0.0)))
+         (instance face :init :vertices (list (float-vector -570.0 -240.0 0.0) (float-vector -570.0 -80.0 0.0) (float-vector -570.0 -80.0 80.0) (float-vector -570.0 -240.0 80.0)))
+         (instance face :init :vertices (list (float-vector -650.0 -240.0 80.0) (float-vector -650.0 -40.0 80.0) (float-vector -650.0 -40.0 800.0) (float-vector -650.0 40.0 800.0) (float-vector -650.0 40.0 80.0) (float-vector -650.0 240.0 80.0) (float-vector -650.0 240.0 0.0) (float-vector -650.0 -240.0 0.0)))
+         (instance face :init :vertices (list (float-vector -570.0 80.0 0.0) (float-vector -370.0 80.0 0.0) (float-vector -370.0 -80.0 0.0) (float-vector -570.0 -80.0 0.0) (float-vector -570.0 -240.0 0.0) (float-vector -650.0 -240.0 0.0) (float-vector -650.0 240.0 0.0) (float-vector -570.0 240.0 0.0)))
+         (instance face :init :vertices (list (float-vector -570.0 80.0 80.0) (float-vector -370.0 80.0 80.0) (float-vector -370.0 80.0 0.0) (float-vector -570.0 80.0 0.0)))
+         (instance face :init :vertices (list (float-vector -650.0 40.0 80.0) (float-vector -570.0 40.0 80.0) (float-vector -570.0 -40.0 80.0) (float-vector -650.0 -40.0 80.0) (float-vector -650.0 -240.0 80.0) (float-vector -570.0 -240.0 80.0) (float-vector -570.0 -80.0 80.0) (float-vector -370.0 -80.0 80.0) (float-vector -370.0 80.0 80.0) (float-vector -570.0 80.0 80.0) (float-vector -570.0 240.0 80.0) (float-vector -650.0 240.0 80.0)))
+         (instance face :init :vertices (list (float-vector -370.0 -80.0 80.0) (float-vector -370.0 -80.0 0.0) (float-vector -370.0 80.0 0.0) (float-vector -370.0 80.0 80.0)))
+         (instance face :init :vertices (list (float-vector -370.0 -80.0 0.0) (float-vector -370.0 -80.0 80.0) (float-vector -570.0 -80.0 80.0) (float-vector -570.0 -80.0 0.0)))
+         (instance face :init :vertices (list (float-vector -570.0 -40.0 80.0) (float-vector -570.0 -40.0 800.0) (float-vector 570.0 -40.0 800.0) (float-vector 570.0 -40.0 80.0) (float-vector 650.0 -40.0 80.0) (float-vector 650.0 -40.0 800.0) (float-vector 750.0 -40.0 800.0) (float-vector 750.0 -40.0 880.0) (float-vector -750.0 -40.0 880.0) (float-vector -750.0 -40.0 800.0) (float-vector -650.0 -40.0 800.0) (float-vector -650.0 -40.0 80.0)))
+         (instance face :init :vertices (list (float-vector -570.0 40.0 800.0) (float-vector -570.0 40.0 80.0) (float-vector -650.0 40.0 80.0) (float-vector -650.0 40.0 800.0) (float-vector -750.0 40.0 800.0) (float-vector -750.0 40.0 880.0) (float-vector 750.0 40.0 880.0) (float-vector 750.0 40.0 800.0) (float-vector 650.0 40.0 800.0) (float-vector 650.0 40.0 80.0) (float-vector 570.0 40.0 80.0) (float-vector 570.0 40.0 800.0)))
+         (instance face :init :vertices (list (float-vector -570.0 40.0 80.0) (float-vector -570.0 40.0 800.0) (float-vector -570.0 -40.0 800.0) (float-vector -570.0 -40.0 80.0)))
+         (instance face :init :vertices (list (float-vector 570.0 40.0 80.0) (float-vector 570.0 -40.0 80.0) (float-vector 570.0 -40.0 800.0) (float-vector 570.0 40.0 800.0)))
+         (instance face :init :vertices (list (float-vector 370.0 -80.0 0.0) (float-vector 370.0 -80.0 80.0) (float-vector 370.0 80.0 80.0) (float-vector 370.0 80.0 0.0)))
+         (instance face :init :vertices (list (float-vector 370.0 -80.0 0.0) (float-vector 570.0 -80.0 0.0) (float-vector 570.0 -80.0 80.0) (float-vector 370.0 -80.0 80.0)))
+         (instance face :init :vertices (list (float-vector 570.0 -80.0 80.0) (float-vector 570.0 -240.0 80.0) (float-vector 650.0 -240.0 80.0) (float-vector 650.0 -40.0 80.0) (float-vector 570.0 -40.0 80.0) (float-vector 570.0 40.0 80.0) (float-vector 650.0 40.0 80.0) (float-vector 650.0 240.0 80.0) (float-vector 570.0 240.0 80.0) (float-vector 570.0 80.0 80.0) (float-vector 370.0 80.0 80.0) (float-vector 370.0 -80.0 80.0)))
+         (instance face :init :vertices (list (float-vector 570.0 80.0 80.0) (float-vector 570.0 80.0 0.0) (float-vector 370.0 80.0 0.0) (float-vector 370.0 80.0 80.0)))
+         (instance face :init :vertices (list (float-vector 570.0 80.0 0.0) (float-vector 570.0 240.0 0.0) (float-vector 650.0 240.0 0.0) (float-vector 650.0 -240.0 0.0) (float-vector 570.0 -240.0 0.0) (float-vector 570.0 -80.0 0.0) (float-vector 370.0 -80.0 0.0) (float-vector 370.0 80.0 0.0)))
+         (instance face :init :vertices (list (float-vector 570.0 -240.0 0.0) (float-vector 570.0 -240.0 80.0) (float-vector 570.0 -80.0 80.0) (float-vector 570.0 -80.0 0.0)))
+         (instance face :init :vertices (list (float-vector 570.0 240.0 80.0) (float-vector 570.0 240.0 0.0) (float-vector 570.0 80.0 0.0) (float-vector 570.0 80.0 80.0)))
+         (instance face :init :vertices (list (float-vector 650.0 -240.0 0.0) (float-vector 650.0 -240.0 80.0) (float-vector 570.0 -240.0 80.0) (float-vector 570.0 -240.0 0.0)))
+         (instance face :init :vertices (list (float-vector 650.0 240.0 80.0) (float-vector 650.0 240.0 0.0) (float-vector 570.0 240.0 0.0) (float-vector 570.0 240.0 80.0)))
+         (instance face :init :vertices (list (float-vector 650.0 240.0 0.0) (float-vector 650.0 240.0 80.0) (float-vector 650.0 40.0 80.0) (float-vector 650.0 40.0 800.0) (float-vector 650.0 -40.0 800.0) (float-vector 650.0 -40.0 80.0) (float-vector 650.0 -240.0 80.0) (float-vector 650.0 -240.0 0.0)))
+       ))
+       ))
+     (dolist (b (cdr bc)) (send (car bc) :assoc b))
+     (send (elt bc 0) :set-color :darkgray)
+     (setq blink0 (instance bodyset-link :init (make-cascoords) :bodies bc :name :handrail-link :weight 1500 :centroid (float-vector 0.0 0.0 0.0) :inertia-tensor #2f((1.0 0.0 0.0) (0.0 1.0 0.0) (0.0 0.0 1.0))))
+
+     ;; definition of assoc
+     (send self :assoc blink0)
+
+     ;; definition of end-coords
+
+     ;; definition of joint
+
+
+     ;; init-ending 
+     (setq links (list blink0))
+     (setq joint-list (list))
+     (send self :init-ending)
+     (send self :move-to (make-coords :pos pos :rot rot))
+     (send-all links :worldcoords)
+
+     self))
+  (:cameras (&rest args)
+   (forward-message-to-all (list) args))
+
+  (:handle (&rest args) (forward-message-to-all (list ) args))
+  (:attention (&rest args) (forward-message-to-all (list ) args))
+  (:button (&rest args) (forward-message-to-all (list ) args))
+  )
+
+(defun misumi-handrail (&rest args) (instance* misumi-handrail-object :init args))
+;; (format *error-output* "(instance misumi-handrail-object :init) for generating model~%")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[652] trunk/EusLisp/lisp/Makefile.Cygwin

From: <ina...@us...> - 2013-08-07 15:21:52

Revision: 652
          http://sourceforge.net/p/euslisp/code/652
Author:   inaba-jsk
Date:     2013-08-07 15:21:43 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
add stack extension for Cygwin

Modified Paths:
--------------
    trunk/EusLisp/lisp/Makefile.Cygwin

Modified: trunk/EusLisp/lisp/Makefile.Cygwin
===================================================================
--- trunk/EusLisp/lisp/Makefile.Cygwin	2013-08-07 04:26:49 UTC (rev 651)
+++ trunk/EusLisp/lisp/Makefile.Cygwin	2013-08-07 15:21:43 UTC (rev 652)
@@ -30,7 +30,8 @@
 #
 # for Cygwin
 
-CPU_OPTIMIZE=-mcpu=i486
+#CPU_OPTIMIZE=-mcpu=i486
+CPU_OPTIMIZE=
 # Pentium's arch returns 'i586', which is ignored by conditionals in c/*.[ch].
 MACHINE=i486
 DEBUG= -g
@@ -38,7 +39,7 @@
 # If you use libc.so.5, remove -DLIB6 option.
 # In order to include thread library, libc.so.6 is preferrable.
 
-CFLAGS=-Wl,--stack,5000000 -D$(MACHINE) -DCygwin -D_REENTRANT -DVERSION=\"$(VERSION)\" \
+CFLAGS=-D$(MACHINE) -DCygwin -D_REENTRANT -DVERSION=\"$(VERSION)\" \
 	-DGCC -DKERNEL -falign-functions=8 \
         $(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \
 	        -I/usr/include -I/usr/X11R6/include -I$(EUSDIR)/lisp/c
@@ -76,8 +77,9 @@
 OFLAGS=-O2
 
 # link-editor's default flags ?-rdynamic 
-SOFLAGS= -shared -Wl,--export-all-symbols -Wl,--unresolved-symbols=ignore-all -Wl,--enable-runtime-pseudo-reloc
-LDFLAGS= -Wl,--out-implib=$(BINDIR)/$(@F).a -Wl,--export-all-symbols -Wl,--enable-auto-import
+#SOFLAGS= -shared -Wl,--export-all-symbols -Wl,--unresolved-symbols=ignore-all -Wl,--enable-runtime-pseudo-reloc
+SOFLAGS= -shared -Wl,--export-all-symbols -Wl,--enable-runtime-pseudo-reloc
+LDFLAGS= -Wl,--out-implib=$(BINDIR)/$(@F).a -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--stack,5000000
 
 MTCOBJECTS= $(OBJDIR)/mthread.o $(OBJDIR)/mthread_posix.o
 MAPOPTION=  $(OBJDIR)/par.o

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[652] trunk/EusLisp/lisp/Makefile.Cygwin

From: <ina...@us...> - 2013-08-07 15:21:50

Revision: 652
          http://sourceforge.net/p/euslisp/code/652
Author:   inaba-jsk
Date:     2013-08-07 15:21:43 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
add stack extension for Cygwin

Modified Paths:
--------------
    trunk/EusLisp/lisp/Makefile.Cygwin

Modified: trunk/EusLisp/lisp/Makefile.Cygwin
===================================================================
--- trunk/EusLisp/lisp/Makefile.Cygwin	2013-08-07 04:26:49 UTC (rev 651)
+++ trunk/EusLisp/lisp/Makefile.Cygwin	2013-08-07 15:21:43 UTC (rev 652)
@@ -30,7 +30,8 @@
 #
 # for Cygwin
 
-CPU_OPTIMIZE=-mcpu=i486
+#CPU_OPTIMIZE=-mcpu=i486
+CPU_OPTIMIZE=
 # Pentium's arch returns 'i586', which is ignored by conditionals in c/*.[ch].
 MACHINE=i486
 DEBUG= -g
@@ -38,7 +39,7 @@
 # If you use libc.so.5, remove -DLIB6 option.
 # In order to include thread library, libc.so.6 is preferrable.
 
-CFLAGS=-Wl,--stack,5000000 -D$(MACHINE) -DCygwin -D_REENTRANT -DVERSION=\"$(VERSION)\" \
+CFLAGS=-D$(MACHINE) -DCygwin -D_REENTRANT -DVERSION=\"$(VERSION)\" \
 	-DGCC -DKERNEL -falign-functions=8 \
         $(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \
 	        -I/usr/include -I/usr/X11R6/include -I$(EUSDIR)/lisp/c
@@ -76,8 +77,9 @@
 OFLAGS=-O2
 
 # link-editor's default flags ?-rdynamic 
-SOFLAGS= -shared -Wl,--export-all-symbols -Wl,--unresolved-symbols=ignore-all -Wl,--enable-runtime-pseudo-reloc
-LDFLAGS= -Wl,--out-implib=$(BINDIR)/$(@F).a -Wl,--export-all-symbols -Wl,--enable-auto-import
+#SOFLAGS= -shared -Wl,--export-all-symbols -Wl,--unresolved-symbols=ignore-all -Wl,--enable-runtime-pseudo-reloc
+SOFLAGS= -shared -Wl,--export-all-symbols -Wl,--enable-runtime-pseudo-reloc
+LDFLAGS= -Wl,--out-implib=$(BINDIR)/$(@F).a -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--stack,5000000
 
 MTCOBJECTS= $(OBJDIR)/mthread.o $(OBJDIR)/mthread_posix.o
 MAPOPTION=  $(OBJDIR)/par.o

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[651] trunk/EusLisp/lisp/Makefile.Cygwin

From: <ina...@us...> - 2013-08-07 04:26:57

Revision: 651
          http://sourceforge.net/p/euslisp/code/651
Author:   inaba-jsk
Date:     2013-08-07 04:26:49 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
add stack-size extension for cygwin

Modified Paths:
--------------
    trunk/EusLisp/lisp/Makefile.Cygwin

Modified: trunk/EusLisp/lisp/Makefile.Cygwin
===================================================================
--- trunk/EusLisp/lisp/Makefile.Cygwin	2013-07-31 17:45:06 UTC (rev 650)
+++ trunk/EusLisp/lisp/Makefile.Cygwin	2013-08-07 04:26:49 UTC (rev 651)
@@ -38,7 +38,7 @@
 # If you use libc.so.5, remove -DLIB6 option.
 # In order to include thread library, libc.so.6 is preferrable.
 
-CFLAGS=-D$(MACHINE) -DCygwin -D_REENTRANT -DVERSION=\"$(VERSION)\" \
+CFLAGS=-Wl,--stack,5000000 -D$(MACHINE) -DCygwin -D_REENTRANT -DVERSION=\"$(VERSION)\" \
 	-DGCC -DKERNEL -falign-functions=8 \
         $(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \
 	        -I/usr/include -I/usr/X11R6/include -I$(EUSDIR)/lisp/c

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[651] trunk/EusLisp/lisp/Makefile.Cygwin

From: <ina...@us...> - 2013-08-07 04:26:55

Revision: 651
          http://sourceforge.net/p/euslisp/code/651
Author:   inaba-jsk
Date:     2013-08-07 04:26:49 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
add stack-size extension for cygwin

Modified Paths:
--------------
    trunk/EusLisp/lisp/Makefile.Cygwin

Modified: trunk/EusLisp/lisp/Makefile.Cygwin
===================================================================
--- trunk/EusLisp/lisp/Makefile.Cygwin	2013-07-31 17:45:06 UTC (rev 650)
+++ trunk/EusLisp/lisp/Makefile.Cygwin	2013-08-07 04:26:49 UTC (rev 651)
@@ -38,7 +38,7 @@
 # If you use libc.so.5, remove -DLIB6 option.
 # In order to include thread library, libc.so.6 is preferrable.
 
-CFLAGS=-D$(MACHINE) -DCygwin -D_REENTRANT -DVERSION=\"$(VERSION)\" \
+CFLAGS=-Wl,--stack,5000000 -D$(MACHINE) -DCygwin -D_REENTRANT -DVERSION=\"$(VERSION)\" \
 	-DGCC -DKERNEL -falign-functions=8 \
         $(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \
 	        -I/usr/include -I/usr/X11R6/include -I$(EUSDIR)/lisp/c

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[650] trunk/EusLisp/lisp

From: <ky...@us...> - 2013-07-31 17:45:18

Revision: 650
          http://sourceforge.net/p/euslisp/code/650
Author:   kyouhei
Date:     2013-07-31 17:45:06 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
gcc on cygwin can't pass option to linker

Modified Paths:
--------------
    trunk/EusLisp/lisp/Makefile.Cygwin
    trunk/EusLisp/lisp/comp/comp.l

Modified: trunk/EusLisp/lisp/Makefile.Cygwin
===================================================================
--- trunk/EusLisp/lisp/Makefile.Cygwin	2013-07-30 08:20:57 UTC (rev 649)
+++ trunk/EusLisp/lisp/Makefile.Cygwin	2013-07-31 17:45:06 UTC (rev 650)
@@ -76,8 +76,7 @@
 OFLAGS=-O2
 
 # link-editor's default flags ?-rdynamic 
-#SOFLAGS= -shared --allow-shlib-undefined --warn-unresolved-symbols --unresolved-symbols=ignore-all --warn-once --enable-extra-pe-debug --enable-auto-import
-SOFLAGS= -shared --export-all-symbols --unresolved-symbols=ignore-all --enable-runtime-pseudo-reloc
+SOFLAGS= -shared -Wl,--export-all-symbols -Wl,--unresolved-symbols=ignore-all -Wl,--enable-runtime-pseudo-reloc
 LDFLAGS= -Wl,--out-implib=$(BINDIR)/$(@F).a -Wl,--export-all-symbols -Wl,--enable-auto-import
 
 MTCOBJECTS= $(OBJDIR)/mthread.o $(OBJDIR)/mthread_posix.o
@@ -141,11 +140,3 @@
 $(BINDIR)/eus:
 	@echo ";; Do not compile eus for Cygwin, Just symlink"
 	(cd $(BINDIR); rm -f eus.exe; ln -sf eusgl.exe eus.exe)
-
-
-
-
-
-
-
-

Modified: trunk/EusLisp/lisp/comp/comp.l
===================================================================
--- trunk/EusLisp/lisp/comp/comp.l	2013-07-30 08:20:57 UTC (rev 649)
+++ trunk/EusLisp/lisp/comp/comp.l	2013-07-31 17:45:06 UTC (rev 650)
@@ -1390,7 +1390,7 @@
 		   (if (and (memq :cygwin *features*)
 			    (not *kernel*))
 			(concatenate string
-				"; gcc -shared -g -falign-functions=4 --export-all-symbols --unresolved-symbols=ignore-all --enable-runtime-pseudo-reloc -o "
+				"; gcc -shared -g -falign-functions=4 -Wl,--export-all-symbols -Wl,--unresolved-symbols=ignore-all -Wl,--enable-runtime-pseudo-reloc -o "
 				(namestring file.dll) " "
 				(namestring file.o) " "
 				*eusdir* (unix:getenv "ARCHDIR")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[650] trunk/EusLisp/lisp

From: <ky...@us...> - 2013-07-31 17:45:17

Revision: 650
          http://sourceforge.net/p/euslisp/code/650
Author:   kyouhei
Date:     2013-07-31 17:45:06 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
gcc on cygwin can't pass option to linker

Modified Paths:
--------------
    trunk/EusLisp/lisp/Makefile.Cygwin
    trunk/EusLisp/lisp/comp/comp.l

Modified: trunk/EusLisp/lisp/Makefile.Cygwin
===================================================================
--- trunk/EusLisp/lisp/Makefile.Cygwin	2013-07-30 08:20:57 UTC (rev 649)
+++ trunk/EusLisp/lisp/Makefile.Cygwin	2013-07-31 17:45:06 UTC (rev 650)
@@ -76,8 +76,7 @@
 OFLAGS=-O2
 
 # link-editor's default flags ?-rdynamic 
-#SOFLAGS= -shared --allow-shlib-undefined --warn-unresolved-symbols --unresolved-symbols=ignore-all --warn-once --enable-extra-pe-debug --enable-auto-import
-SOFLAGS= -shared --export-all-symbols --unresolved-symbols=ignore-all --enable-runtime-pseudo-reloc
+SOFLAGS= -shared -Wl,--export-all-symbols -Wl,--unresolved-symbols=ignore-all -Wl,--enable-runtime-pseudo-reloc
 LDFLAGS= -Wl,--out-implib=$(BINDIR)/$(@F).a -Wl,--export-all-symbols -Wl,--enable-auto-import
 
 MTCOBJECTS= $(OBJDIR)/mthread.o $(OBJDIR)/mthread_posix.o
@@ -141,11 +140,3 @@
 $(BINDIR)/eus:
 	@echo ";; Do not compile eus for Cygwin, Just symlink"
 	(cd $(BINDIR); rm -f eus.exe; ln -sf eusgl.exe eus.exe)
-
-
-
-
-
-
-
-

Modified: trunk/EusLisp/lisp/comp/comp.l
===================================================================
--- trunk/EusLisp/lisp/comp/comp.l	2013-07-30 08:20:57 UTC (rev 649)
+++ trunk/EusLisp/lisp/comp/comp.l	2013-07-31 17:45:06 UTC (rev 650)
@@ -1390,7 +1390,7 @@
 		   (if (and (memq :cygwin *features*)
 			    (not *kernel*))
 			(concatenate string
-				"; gcc -shared -g -falign-functions=4 --export-all-symbols --unresolved-symbols=ignore-all --enable-runtime-pseudo-reloc -o "
+				"; gcc -shared -g -falign-functions=4 -Wl,--export-all-symbols -Wl,--unresolved-symbols=ignore-all -Wl,--enable-runtime-pseudo-reloc -o "
 				(namestring file.dll) " "
 				(namestring file.o) " "
 				*eusdir* (unix:getenv "ARCHDIR")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[649] trunk/EusLisp/lisp/c/unixcall.c

From: <sn...@us...> - 2013-07-30 08:21:09

Revision: 649
          http://sourceforge.net/p/euslisp/code/649
Author:   snozawa
Date:     2013-07-30 08:20:57 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
check non-existent directory by dirp ;; I set the return value NIL because probe-file or l/process.l return NIL if you access non-existent directory

Modified Paths:
--------------
    trunk/EusLisp/lisp/c/unixcall.c

Modified: trunk/EusLisp/lisp/c/unixcall.c
===================================================================
--- trunk/EusLisp/lisp/c/unixcall.c	2013-07-28 07:36:49 UTC (rev 648)
+++ trunk/EusLisp/lisp/c/unixcall.c	2013-07-30 08:20:57 UTC (rev 649)
@@ -1127,7 +1127,7 @@
 
   ckarg2(0,1);
   if (n==1)  s=get_string(argv[0]); else s=(byte *)".";
-  dirp = opendir((char *)s);
+  if ( (dirp = opendir((char *)s)) == NULL ) return (NIL);
   while ( (direntp = readdir( dirp )) != NULL ){
      str=direntp->d_name; 
      if(flag) a=cons(ctx,makestring(str,strlen(str)),a);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[649] trunk/EusLisp/lisp/c/unixcall.c

From: <sn...@us...> - 2013-07-30 08:21:08

Revision: 649
          http://sourceforge.net/p/euslisp/code/649
Author:   snozawa
Date:     2013-07-30 08:20:57 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
check non-existent directory by dirp ;; I set the return value NIL because probe-file or l/process.l return NIL if you access non-existent directory

Modified Paths:
--------------
    trunk/EusLisp/lisp/c/unixcall.c

Modified: trunk/EusLisp/lisp/c/unixcall.c
===================================================================
--- trunk/EusLisp/lisp/c/unixcall.c	2013-07-28 07:36:49 UTC (rev 648)
+++ trunk/EusLisp/lisp/c/unixcall.c	2013-07-30 08:20:57 UTC (rev 649)
@@ -1127,7 +1127,7 @@
 
   ckarg2(0,1);
   if (n==1)  s=get_string(argv[0]); else s=(byte *)".";
-  dirp = opendir((char *)s);
+  if ( (dirp = opendir((char *)s)) == NULL ) return (NIL);
   while ( (direntp = readdir( dirp )) != NULL ){
      str=direntp->d_name; 
      if(flag) a=cons(ctx,makestring(str,strlen(str)),a);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[648] trunk/EusLisp/lisp

From: <ky...@us...> - 2013-07-28 07:37:26

Revision: 648
          http://sourceforge.net/p/euslisp/code/648
Author:   kyouhei
Date:     2013-07-28 07:36:49 +0000 (Sun, 28 Jul 2013)
Log Message:
-----------
commit patch for compiling on ARM Linux, refere to https://sourceforge.net/p/jskeus/tickets/35/

Modified Paths:
--------------
    trunk/EusLisp/lisp/Makefile.generic2
    trunk/EusLisp/lisp/c/calleus.c
    trunk/EusLisp/lisp/c/eus.c
    trunk/EusLisp/lisp/c/eus.h
    trunk/EusLisp/lisp/c/eusstream.c
    trunk/EusLisp/lisp/c/printer.c
    trunk/EusLisp/lisp/c/reader.c
    trunk/EusLisp/lisp/c/unixcall.c
    trunk/EusLisp/lisp/comp/comp.l
    trunk/EusLisp/lisp/comp/trans.l
    trunk/EusLisp/lisp/tool/compile_comp.l
    trunk/EusLisp/lisp/tool/compile_geo.l
    trunk/EusLisp/lisp/tool/compile_gl.l
    trunk/EusLisp/lisp/tool/compile_image.l
    trunk/EusLisp/lisp/tool/compile_l.l
    trunk/EusLisp/lisp/tool/compile_xwindow.l
    trunk/EusLisp/lisp/xwindow/Xgraphics.l

Added Paths:
-----------
    trunk/EusLisp/lisp/Makefile.LinuxARM

Added: trunk/EusLisp/lisp/Makefile.LinuxARM
===================================================================
--- trunk/EusLisp/lisp/Makefile.LinuxARM	                        (rev 0)
+++ trunk/EusLisp/lisp/Makefile.LinuxARM	2013-07-28 07:36:49 UTC (rev 648)
@@ -0,0 +1,109 @@
+# makefile for EusLisp on sun4 with SunOS (Solaris)
+# RCSid="@(#)$Id$"
+#	Copyright (1988) Toshihiro MATSUI, Electrotechnical Laboratory
+#	1989/Oct
+#	1990/Sep Second Tape Distribution
+#	KOBJECTS --- eus kernel objects written in C
+#	NOKOBJECTS-- eus kernel, but cannot be optimized with -O option
+#	CLIBOBJECTS- functions written in C, not members of kernel
+#	LOBJECTS --- functions coded in EUSLISP; must be compiled with euscomp
+#	GEOOBJECTS-- geometric modeling functions and classes
+#	XOBJECTS---- Xwindow interface
+#	XTKOBJECTS---- Xwindow interface
+#	IMGOBJECTS--- image processing
+#	MTOBJECTS--- multithread functions
+#
+#########################################################################
+# Customizable section begins
+#########################################################################
+ifneq ($(ARCHDIR),)
+ARCH=$(ARCHDIR)
+else
+ARCH=LinuxARM
+endif
+
+include Makefile.generic1
+
+THREAD= -DTHREADED -DPTHREAD
+MFLAGS=
+XVERSION=X_V11R6_1
+
+
+#
+# Select CFLAGS and XVERSION according to the version of SunOS and Xlib.
+#
+# for ARM
+
+MACHINE=armv6
+#MACHINE=armv5te
+
+GCC_VERSION=$(shell gcc -dumpversion | sed s/\\..\*//)
+ifeq ($(GCC_VERSION), 2)
+ CPU_OPTIMIZE=
+ ALIGN_FUNCTIONS="-malign-functions=4"
+else
+ CPU_OPTIMIZE=-march=$(MACHINE)
+ ALIGN_FUNCTIONS=-falign-functions=4
+ GCC3=-DGCC3
+endif
+
+# Pentium's arch returns 'i586', which is ignored by conditionals in c/*.[ch].
+DEBUG= -g
+#WFLAGS= -Wall -Wno-unused -Wno-switch -Wno-return-type -Wno-comment
+
+# If you use libc.so.5, remove -DLIB6 option.
+# In order to include thread library, libc.so.6 is preferrable.
+
+CFLAGS=$(WFLAGS) -D$(MACHINE) -DLinux -DARM -D_REENTRANT -DVERSION=\"$(VERSION)\" \
+	-DLIB6 $(ALIGN_FUNCTIONS) \
+        $(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \
+	-DGCC $(GCC3) \
+	        -I/usr/include -I/usr/X11R6/include -I$(EUSDIR)/include
+
+# Use gcc for C-compiling on SunOS4. Sun's cc is ok on Solaris.
+# /usr/ucb/cc cannot compile because of its incapability of recognizing
+# prototype declarations.
+CC=gcc
+LD=gcc
+
+#
+# L I B R A R I E S
+# Three kinds of libraries are needed to build eus.
+# 1. RAWLIB: unix libraries needed to make eus0-eus2
+# 2. XLIB: X window libraries
+#    When you use a window toolkit, you may need to override the 'read'
+#    function in libc.a with a specific window library such as libXview.a.
+# 3. EUSLIB: euslisp functions that cannot be linked in eus because of
+#    'GLOBAL OFFSET TABLE OVERFLOW', that are xwindow interface functions.
+# You may add any optional user-supplied library in EUSLIB.
+# On Solaris, XLIB and EUSLIB are combined together into lib/libeusx.so.
+
+# Linux
+RAWLIB=-ldl -lm -lpthread
+XLIB= -L/usr/X11R6/lib -lX11
+
+# specify directories where euslisp's libraries are located.
+EUSLIB= -Xlinker -R$(ADLIBDIR):$(EUSDIR)/lib/ARM -L$(ADLIBDIR) 
+GLLIB= -L$(ADLIBDIR) -lGLU -lGL -lXext -leusgl
+
+# POSIX Thread 
+THREADDEP=mthread_posix.c
+#THREADDEP=pthreads.c
+
+# If you don't like optimization, comment out the next line.
+OFLAGS=-O2
+
+# link-editor's default flags ?-rdynamic 
+SOFLAGS= -shared
+LDFLAGS= -rdynamic -fno-stack-protector -Wl,-z,execstack
+MTCOBJECTS= $(OBJDIR)/mthread.o $(OBJDIR)/mthread_posix.o
+#MTCOBJECTS= $(OBJDIR)/mthread.o $(OBJDIR)/pthreads.o
+MAPOPTION=$(OBJDIR)/par.o
+
+#################################################################
+# end of the customizable section
+################################################################
+
+#include Makefile.rgc
+include Makefile.generic2
+

Modified: trunk/EusLisp/lisp/Makefile.generic2
===================================================================
--- trunk/EusLisp/lisp/Makefile.generic2	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/Makefile.generic2	2013-07-28 07:36:49 UTC (rev 648)
@@ -249,7 +249,7 @@
 
 $(BINDIR)/eus:	 $(NOKOBJECTS) $(KOBJECTS) $(KSOBJECTS) $(LOBJECTS) \
 		$(LCOBJECTS)  $(COMPOBJECTS) \
-		$(MTCOBJECTS) $(RGCOBJECTS) $(MTOBJECTS) \
+		$(MTCOBJECTS) $(RGCOBJECTS) $(MTOBJECTS) $(MAPOPTION) \
 		$(ADLIBDIR)/$(LIBEUSGEO) $(ADLIBDIR)/$(LIBEUSX) 
 	($(CC) -o $(BINDIR)/eus $(LDFLAGS)  \
 		$(NOKOBJECTS) $(KOBJECTS) $(KSOBJECTS) \
@@ -270,7 +270,7 @@
 		$(EUSLIB) $(EUSXLIB) $(GEOLIB) $(IMGLIB) $(EDGELIB) $(XLIB) $(RAWLIB))
 
 $(BINDIR)/eusgl:	 $(NOKOBJECTS) $(KOBJECTS) $(KSOBJECTS) $(LOBJECTS) \
-		$(LCOBJECTS) $(COMPOBJECTS)  \
+		$(LCOBJECTS) $(COMPOBJECTS)  $(MAPOPTION) \
 		$(ADLIBDIR)/$(LIBEUSGEO) $(ADLIBDIR)/$(LIBEUSX) $(ADLIBDIR)/$(LIBEUSGL) 
 	($(CC) -o $(BINDIR)/eusgl $(LDFLAGS)  \
 		$(NOKOBJECTS) $(KOBJECTS) $(KSOBJECTS) \
@@ -319,7 +319,7 @@
         $(CC) -c -o $(OBJDIR)/constants.l.o $(CFLAGS) constants.l.c; \
 	 $(BINDIR)/gccls eusstart.l; \
         $(CC) -c $(CFLAGS) -o $(OBJDIR)/eusstart.l.o eusstart.l.c)
-$(LOBJECTS):
+$(LOBJECTS) $(MAPOPTION):
 	(echo $*; $(BINDIR)/euscomp <$(TOOLDIR)/compile_l.l)
 $(COMPOBJECTS):	$(GCCLS)
 	($(BINDIR)/euscomp <$(TOOLDIR)/compile_comp.l ; \

Modified: trunk/EusLisp/lisp/c/calleus.c
===================================================================
--- trunk/EusLisp/lisp/c/calleus.c	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/calleus.c	2013-07-28 07:36:49 UTC (rev 648)
@@ -27,7 +27,7 @@
 #include "eus.h"
 
 struct foreignpod {
-#if vax || sun4 || news || mips || i386 || alpha || x86_64
+#if vax || sun4 || news || mips || i386 || alpha || x86_64 || ARM
     unsigned mark:1;
     unsigned b:1;
     unsigned m:1;

Modified: trunk/EusLisp/lisp/c/eus.c
===================================================================
--- trunk/EusLisp/lisp/c/eus.c	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/eus.c	2013-07-28 07:36:49 UTC (rev 648)
@@ -911,6 +911,9 @@
 #if x86_64
   p=cons(ctx,intern(ctx,"X86_64",6,keywordpkg),p);
 #endif
+#if ARM
+  p=cons(ctx,intern(ctx,"ARM",3,keywordpkg),p);
+#endif
 
   defvar(ctx,"*FEATURES*",p,lisppkg);
 

Modified: trunk/EusLisp/lisp/c/eus.h
===================================================================
--- trunk/EusLisp/lisp/c/eus.h	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/eus.h	2013-07-28 07:36:49 UTC (rev 648)
@@ -369,7 +369,7 @@
 /****************************************************************/
 typedef 
   struct cell {
-#if vax || sun4 || news || mips || i386 || i486 || i586 || alpha || x86_64
+#if vax || sun4 || news || mips || i386 || i486 || i586 || alpha || x86_64 || ARM
     unsigned mark:1;
     unsigned b:1;
     unsigned m:1;
@@ -733,7 +733,7 @@
 #define bpointerof(p) ((bpointer)((eusinteger_t)(p)-2))
 #endif
 
-#if vax || sun4 || news || mips || i386 || i486 || i586 || alpha || x86_64
+#if vax || sun4 || news || mips || i386 || i486 || i586 || alpha || x86_64 || ARM
 
 #define makepointer(bp) ((pointer)((eusinteger_t)(bp)))
 // #define isint(p) (((eusinteger_t)(p) & 3)==2) // org
@@ -792,7 +792,7 @@
 #define bixof(p) (bpointerof(p)->h.bix)
 #endif
 
-#if sun3 || sun4 || system5 || apollo || news || sanyo || vxworks || mips || NEXT || i386 || i486 || i586 || x86_64
+#if sun3 || sun4 || system5 || apollo || news || sanyo || vxworks || mips || NEXT || i386 || i486 || i586 || x86_64 || ARM
 #if x86_64
 #define fltval(p) (nu.ival=((eusinteger_t)(p) & ~3L), nu.fval)
 #define makeflt(f) (nu.fval=(eusfloat_t)(f), (pointer)((nu.ival & ~3L) | 1L))

Modified: trunk/EusLisp/lisp/c/eusstream.c
===================================================================
--- trunk/EusLisp/lisp/c/eusstream.c	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/eusstream.c	2013-07-28 07:36:49 UTC (rev 648)
@@ -88,7 +88,7 @@
 #if system5 || Solaris2
       if (c<0) { breakck; goto tryqread;}
 #endif
-#if sun3 || sun4 || vax || apollo || news || sanyo || mips || i386 || alpha || x86_64
+#if sun3 || sun4 || vax || apollo || news || sanyo || mips || i386 || alpha || x86_64 || ARM
       breakck;
 #endif
       s->c.stream.buffer->c.str.length=lsave;

Modified: trunk/EusLisp/lisp/c/printer.c
===================================================================
--- trunk/EusLisp/lisp/c/printer.c	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/printer.c	2013-07-28 07:36:49 UTC (rev 648)
@@ -556,7 +556,7 @@
   if (isnum(x)) { printnum(ctx,x,f,intval(Spevalof(PRINTBASE)),0,0); return;}
   else if (x==UNBOUND) { writestr(f,(byte *)"***UNBOUND***",13); return;}
   /*pointed object*/
-#if vax || sun4 || news || mips || i386 || alpha || x86_64
+#if vax || sun4 || news || mips || i386 || alpha || x86_64  || ARM
   if ((x<(pointer)(ctx->stack)) && ((pointer)(ctx->stacklimit)<x)){
 	printint(ctx,(eusinteger_t)x,f,intval(Spevalof(PRINTBASE)),0,0); return;}
 #endif

Modified: trunk/EusLisp/lisp/c/reader.c
===================================================================
--- trunk/EusLisp/lisp/c/reader.c	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/reader.c	2013-07-28 07:36:49 UTC (rev 648)
@@ -188,8 +188,12 @@
 #if IRIX || Linux_ppc
 #define Char int
 #else
+#if ARM
+#define Char signed char
+#else
 #define Char char
 #endif
+#endif
 
 static Char skip(ctx, f, ch)
 context *ctx;
@@ -264,7 +268,7 @@
 #if sun3 ||( !alpha && system5 ) || sanyo
   labp->c.lab.unsolved=(pointer)addr;
 #endif
-#if sun4 || vax || news || mips || alpha || i386 || x86_64
+#if sun4 || vax || news || mips || alpha || i386 || x86_64 || ARM
   { eusinteger_t i;
     i=(((eusinteger_t)addr)>>2);
     labp->c.lab.unsolved=makeint(i);}

Modified: trunk/EusLisp/lisp/c/unixcall.c
===================================================================
--- trunk/EusLisp/lisp/c/unixcall.c	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/unixcall.c	2013-07-28 07:36:49 UTC (rev 648)
@@ -447,7 +447,7 @@
   return(makeint(alarm(ckintval(argv[0]))));}
 
 
-#if sun3 || sun4 || news || sanyo  || alpha || i386 || x86_64
+#if sun3 || sun4 || news || sanyo  || alpha || i386 || x86_64 || ARM
 #if !Solaris2
 pointer UALARM(ctx,n,argv)
 register context *ctx;
@@ -621,7 +621,7 @@
   }
 #endif
 
-#if sun3 || sun4 || vax || news || sanyo || (mips && !IRIX && !IRIX6) || i386 || alpha || x86_64
+#if sun3 || sun4 || vax || news || sanyo || (mips && !IRIX && !IRIX6) || i386 || alpha || x86_64 || ARM
 pointer VFORK(ctx,n,argv)
 register context *ctx;
 int n;
@@ -1341,7 +1341,7 @@
   if (envval) return(makestring(envval,strlen(envval)));
   else return(NIL);}
 
-#if sun3 || sun4 || vax || mips || i386 || alpha || x86_64
+#if sun3 || sun4 || vax || mips || i386 || alpha || x86_64 || ARM
 pointer PUTENV(ctx,n,argv)
 register context *ctx;
 int n;
@@ -2040,7 +2040,7 @@
   defun(ctx,"GETTIMEOFDAY",mod,GETTIMEOFDAY);
   defun(ctx,"ALARM",mod,ALARM);
 
-#if sun3 || sun4 || news || sanyo || alpha || x86_64 /* why i386 does not exist? */
+#if sun3 || sun4 || news || sanyo || alpha || x86_64 || ARM /* why i386 does not exist? */
 #if !Solaris2
   defun(ctx,"UALARM",mod,UALARM);
 #endif
@@ -2115,7 +2115,7 @@
   defun(ctx,"NTOHS",mod,N2HS);
 #endif
 
-#if sun3 || sun4 || vax || news || sanyo || (mips && !IRIX && !IRIX6) || i386 || alpha || x86_64
+#if sun3 || sun4 || vax || news || sanyo || (mips && !IRIX && !IRIX6) || i386 || alpha || x86_64 || ARM
   defun(ctx,"VFORK",mod,VFORK);
 #endif
   defun(ctx,"EXEC",mod,EXEC);
@@ -2124,7 +2124,7 @@
   defun(ctx,"SETPRIORITY",mod,SETPRIORITY);
 #endif
 
-#if sun3 || sun4 || vax || mips || i386 || alpha || x86_64
+#if sun3 || sun4 || vax || mips || i386 || alpha || x86_64 || ARM
   defun(ctx,"PUTENV",mod,PUTENV);
 #endif
 #if sun3 || sun4 && !Solaris2 || Linux || alpha || Cygwin

Modified: trunk/EusLisp/lisp/comp/comp.l
===================================================================
--- trunk/EusLisp/lisp/comp/comp.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/comp/comp.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -1313,9 +1313,12 @@
 			      " -DDarwin -Dx86_64 -DLinux -w -malign-functions=8 "
 			    " -DDarwin -Di386 -DLinux -w -malign-functions=4 "))
 		   	 ((and (memq :linux *features*)  (memq :gcc3 *features*))
-			  (if (memq :x86_64 *features*)
-				" -Dx86_64 -DLinux -Wimplicit -falign-functions=8 -DGCC3 "
-				" -Di386 -DLinux -Wimplicit -falign-functions=4 -DGCC3 "))
+			  (cond
+                           ((memq :x86_64 *features*)
+                            " -Dx86_64 -DLinux -Wimplicit -falign-functions=8 -DGCC3 ")
+                           ((memq :arm *features*)
+                            " -DARM -DLinux -Wimplicit -falign-functions=4 -DGCC3 ")
+                           (t " -Di386 -DLinux -Wimplicit -falign-functions=4 -DGCC3 ")))
 		   	 ((memq :linux *features*)
 			  (if (memq :x86_64 *features)
 				" -Dx86_64 -DLinux -Wimplicit -malign-functions=8 "

Modified: trunk/EusLisp/lisp/comp/trans.l
===================================================================
--- trunk/EusLisp/lisp/comp/trans.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/comp/trans.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -454,7 +454,7 @@
 	   (send self :store "w")
 	   (when (memq op '(+ -))
 	      (format cfile
-		 "#if sun4 || vax || mips || i386 || alpha || x86_64~%	w=(pointer)((eusinteger_t)w-2);~%#endif~%"))
+		 "#if sun4 || vax || mips || i386 || alpha || x86_64 || ARM~%	w=(pointer)((eusinteger_t)w-2);~%#endif~%"))
 	   (send self :push
 		 (format nil "(pointer)((eusinteger_t)~A ~A (eusinteger_t)w)"
 			 (send self :pop) 

Modified: trunk/EusLisp/lisp/tool/compile_comp.l
===================================================================
--- trunk/EusLisp/lisp/tool/compile_comp.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/tool/compile_comp.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -18,8 +18,12 @@
 	    ((member :darwin *features*) "../../Darwin/obj/")
 	    ((member :sh4 *features*) "../../LinuxSH4/obj/")
             ((member :linux *features*)
-             (if (member :x86_64 *features*)
-                 "../../Linux64/obj/" "../../Linux/obj/"))
+             (cond
+              ((member :x86_64 *features*)
+               "../../Linux64/obj/")
+              ((member :arm *features*)
+               "../../LinuxARM/obj/")
+              (t "../../Linux/obj/")))
 	    ((member :SunOS4.1 *features*) "../../SunOS4/obj/")
 	    ((member :Windows *features*) "../../Windows/obj/")
 	    ((member :Windows95 *features*) "../../Win95/obj/")

Modified: trunk/EusLisp/lisp/tool/compile_geo.l
===================================================================
--- trunk/EusLisp/lisp/tool/compile_geo.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/tool/compile_geo.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -17,8 +17,12 @@
 	    ((member :darwin *features*) "../../Darwin/obj/")
 	    ((member :sh4 *features*) "../../LinuxSH4/obj/")
             ((member :linux *features*)
-             (if (member :x86_64 *features*)
-                 "../../Linux64/obj/" "../../Linux/obj/"))
+             (cond
+              ((member :x86_64 *features*)
+               "../../Linux64/obj/")
+              ((member :arm *features*)
+               "../../LinuxARM/obj/")
+              (t "../../Linux/obj/")))
 	    ((member :SunOS4.1 *features*) "../../SunOS4/obj/")
 	    ((member :Windows *features*) "../../Windows/obj/")
 	    ((member :Windows95 *features*) "../../Win95/obj/")

Modified: trunk/EusLisp/lisp/tool/compile_gl.l
===================================================================
--- trunk/EusLisp/lisp/tool/compile_gl.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/tool/compile_gl.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -19,8 +19,12 @@
 	    ((member :irix6 *features*) "../../../IRIX6/obj/")
 	    ((member :darwin *features*) "../../../Darwin/obj/")
             ((member :linux *features*)
-             (if (member :x86_64 *features*)
-                 "../../../Linux64/obj/" "../../../Linux/obj/"))
+             (cond
+              ((member :x86_64 *features*)
+               "../../../Linux64/obj/")
+              ((member :arm *features*)
+               "../../../LinuxARM/obj/")
+              (t "../../../Linux/obj/")))
 	    ((member :SunOS4.1 *features*) "../../../SunOS4/obj/")
 	    ((member :Windows *features*) "../../../Windows/obj/")
 	    ((member :Windows95 *features*) "../../../Win95/obj/")

Modified: trunk/EusLisp/lisp/tool/compile_image.l
===================================================================
--- trunk/EusLisp/lisp/tool/compile_image.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/tool/compile_image.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -22,8 +22,12 @@
 	    ((member :darwin *features*) "../../Darwin/obj/")
 	    ((member :sh4 *features*) "../../LinuxSH4/obj/")
             ((member :linux *features*)
-             (if (member :x86_64 *features*)
-                 "../../Linux64/obj/" "../../Linux/obj/"))
+             (cond
+              ((member :x86_64 *features*)
+               "../../Linux64/obj/")
+              ((member :arm *features*)
+               "../../LinuxARM/obj/")
+              (t "../../Linux/obj/")))
 	    ((member :SunOS4.1 *features*) "../../SunOS4/obj/")
 	    ((member :Windows *features*) "../../Windows/obj/")
 	    ((member :Windows95 *features*) "../../Win95/obj/")

Modified: trunk/EusLisp/lisp/tool/compile_l.l
===================================================================
--- trunk/EusLisp/lisp/tool/compile_l.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/tool/compile_l.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -17,8 +17,12 @@
 	    ((member :darwin *features*) "../../Darwin/obj/")
 	    ((member :sh4 *features*) "../../LinuxSH4/obj/")
 	    ((member :linux *features*)
-             (if (member :x86_64 *features*)
-                 "../../Linux64/obj/" "../../Linux/obj/"))
+             (cond
+              ((member :x86_64 *features*)
+               "../../Linux64/obj/")
+              ((member :arm *features*)
+               "../../LinuxARM/obj/")
+              (t "../../Linux/obj/")))
 	    ((member :SunOS4.1 *features*) "../../SunOS4/obj/")
 	    ((member :Windows *features*) "../../Windows/obj/")
 	    ((member :Windows95 *features*) "../../Win95/obj/")

Modified: trunk/EusLisp/lisp/tool/compile_xwindow.l
===================================================================
--- trunk/EusLisp/lisp/tool/compile_xwindow.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/tool/compile_xwindow.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -16,8 +16,12 @@
 	    ((member :irix6 *features*) "../../IRIX6/obj/")
 	    ((member :darwin *features*) "../../Darwin/obj/")
             ((member :linux *features*)
-             (if (member :x86_64 *features*)
-                 "../../Linux64/obj/" "../../Linux/obj/"))
+             (cond
+              ((member :x86_64 *features*)
+               "../../Linux64/obj/")
+              ((member :arm *features*)
+               "../../LinuxARM/obj/")
+              (t "../../Linux/obj/")))
 	    ((member :SunOS4.1 *features*) "../../SunOS4/obj/")
 	    ((member :Windows *features*) "../../Windows/obj/")
 	    ((member :Windows95 *features*) "../../Win95/obj/")

Modified: trunk/EusLisp/lisp/xwindow/Xgraphics.l
===================================================================
--- trunk/EusLisp/lisp/xwindow/Xgraphics.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/xwindow/Xgraphics.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -200,9 +200,9 @@
 		    direction font_ascent font_descent overall)
   (integer-vector (c-int font_ascent)
 		  (c-int font_descent)
-#-(or :i386 :alpha :x86_64)
+#-(or :i386 :alpha :x86_64 :arm)
 		%(overall [ 4 ] * 256 + overall [ 5 ])
-#+(or :i386 :alpha :x86_64)
+#+(or :i386 :alpha :x86_64 :arm)
 		%(overall [ 5 ] * 256 + overall [ 4 ])
 		)))
 	#| return = (ascent descent width) |#

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Euslisp-commit] SF.net SVN: euslisp:[648] trunk/EusLisp/lisp

From: <ky...@us...> - 2013-07-28 07:37:24

Revision: 648
          http://sourceforge.net/p/euslisp/code/648
Author:   kyouhei
Date:     2013-07-28 07:36:49 +0000 (Sun, 28 Jul 2013)
Log Message:
-----------
commit patch for compiling on ARM Linux, refere to https://sourceforge.net/p/jskeus/tickets/35/

Modified Paths:
--------------
    trunk/EusLisp/lisp/Makefile.generic2
    trunk/EusLisp/lisp/c/calleus.c
    trunk/EusLisp/lisp/c/eus.c
    trunk/EusLisp/lisp/c/eus.h
    trunk/EusLisp/lisp/c/eusstream.c
    trunk/EusLisp/lisp/c/printer.c
    trunk/EusLisp/lisp/c/reader.c
    trunk/EusLisp/lisp/c/unixcall.c
    trunk/EusLisp/lisp/comp/comp.l
    trunk/EusLisp/lisp/comp/trans.l
    trunk/EusLisp/lisp/tool/compile_comp.l
    trunk/EusLisp/lisp/tool/compile_geo.l
    trunk/EusLisp/lisp/tool/compile_gl.l
    trunk/EusLisp/lisp/tool/compile_image.l
    trunk/EusLisp/lisp/tool/compile_l.l
    trunk/EusLisp/lisp/tool/compile_xwindow.l
    trunk/EusLisp/lisp/xwindow/Xgraphics.l

Added Paths:
-----------
    trunk/EusLisp/lisp/Makefile.LinuxARM

Added: trunk/EusLisp/lisp/Makefile.LinuxARM
===================================================================
--- trunk/EusLisp/lisp/Makefile.LinuxARM	                        (rev 0)
+++ trunk/EusLisp/lisp/Makefile.LinuxARM	2013-07-28 07:36:49 UTC (rev 648)
@@ -0,0 +1,109 @@
+# makefile for EusLisp on sun4 with SunOS (Solaris)
+# RCSid="@(#)$Id$"
+#	Copyright (1988) Toshihiro MATSUI, Electrotechnical Laboratory
+#	1989/Oct
+#	1990/Sep Second Tape Distribution
+#	KOBJECTS --- eus kernel objects written in C
+#	NOKOBJECTS-- eus kernel, but cannot be optimized with -O option
+#	CLIBOBJECTS- functions written in C, not members of kernel
+#	LOBJECTS --- functions coded in EUSLISP; must be compiled with euscomp
+#	GEOOBJECTS-- geometric modeling functions and classes
+#	XOBJECTS---- Xwindow interface
+#	XTKOBJECTS---- Xwindow interface
+#	IMGOBJECTS--- image processing
+#	MTOBJECTS--- multithread functions
+#
+#########################################################################
+# Customizable section begins
+#########################################################################
+ifneq ($(ARCHDIR),)
+ARCH=$(ARCHDIR)
+else
+ARCH=LinuxARM
+endif
+
+include Makefile.generic1
+
+THREAD= -DTHREADED -DPTHREAD
+MFLAGS=
+XVERSION=X_V11R6_1
+
+
+#
+# Select CFLAGS and XVERSION according to the version of SunOS and Xlib.
+#
+# for ARM
+
+MACHINE=armv6
+#MACHINE=armv5te
+
+GCC_VERSION=$(shell gcc -dumpversion | sed s/\\..\*//)
+ifeq ($(GCC_VERSION), 2)
+ CPU_OPTIMIZE=
+ ALIGN_FUNCTIONS="-malign-functions=4"
+else
+ CPU_OPTIMIZE=-march=$(MACHINE)
+ ALIGN_FUNCTIONS=-falign-functions=4
+ GCC3=-DGCC3
+endif
+
+# Pentium's arch returns 'i586', which is ignored by conditionals in c/*.[ch].
+DEBUG= -g
+#WFLAGS= -Wall -Wno-unused -Wno-switch -Wno-return-type -Wno-comment
+
+# If you use libc.so.5, remove -DLIB6 option.
+# In order to include thread library, libc.so.6 is preferrable.
+
+CFLAGS=$(WFLAGS) -D$(MACHINE) -DLinux -DARM -D_REENTRANT -DVERSION=\"$(VERSION)\" \
+	-DLIB6 $(ALIGN_FUNCTIONS) \
+        $(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \
+	-DGCC $(GCC3) \
+	        -I/usr/include -I/usr/X11R6/include -I$(EUSDIR)/include
+
+# Use gcc for C-compiling on SunOS4. Sun's cc is ok on Solaris.
+# /usr/ucb/cc cannot compile because of its incapability of recognizing
+# prototype declarations.
+CC=gcc
+LD=gcc
+
+#
+# L I B R A R I E S
+# Three kinds of libraries are needed to build eus.
+# 1. RAWLIB: unix libraries needed to make eus0-eus2
+# 2. XLIB: X window libraries
+#    When you use a window toolkit, you may need to override the 'read'
+#    function in libc.a with a specific window library such as libXview.a.
+# 3. EUSLIB: euslisp functions that cannot be linked in eus because of
+#    'GLOBAL OFFSET TABLE OVERFLOW', that are xwindow interface functions.
+# You may add any optional user-supplied library in EUSLIB.
+# On Solaris, XLIB and EUSLIB are combined together into lib/libeusx.so.
+
+# Linux
+RAWLIB=-ldl -lm -lpthread
+XLIB= -L/usr/X11R6/lib -lX11
+
+# specify directories where euslisp's libraries are located.
+EUSLIB= -Xlinker -R$(ADLIBDIR):$(EUSDIR)/lib/ARM -L$(ADLIBDIR) 
+GLLIB= -L$(ADLIBDIR) -lGLU -lGL -lXext -leusgl
+
+# POSIX Thread 
+THREADDEP=mthread_posix.c
+#THREADDEP=pthreads.c
+
+# If you don't like optimization, comment out the next line.
+OFLAGS=-O2
+
+# link-editor's default flags ?-rdynamic 
+SOFLAGS= -shared
+LDFLAGS= -rdynamic -fno-stack-protector -Wl,-z,execstack
+MTCOBJECTS= $(OBJDIR)/mthread.o $(OBJDIR)/mthread_posix.o
+#MTCOBJECTS= $(OBJDIR)/mthread.o $(OBJDIR)/pthreads.o
+MAPOPTION=$(OBJDIR)/par.o
+
+#################################################################
+# end of the customizable section
+################################################################
+
+#include Makefile.rgc
+include Makefile.generic2
+

Modified: trunk/EusLisp/lisp/Makefile.generic2
===================================================================
--- trunk/EusLisp/lisp/Makefile.generic2	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/Makefile.generic2	2013-07-28 07:36:49 UTC (rev 648)
@@ -249,7 +249,7 @@
 
 $(BINDIR)/eus:	 $(NOKOBJECTS) $(KOBJECTS) $(KSOBJECTS) $(LOBJECTS) \
 		$(LCOBJECTS)  $(COMPOBJECTS) \
-		$(MTCOBJECTS) $(RGCOBJECTS) $(MTOBJECTS) \
+		$(MTCOBJECTS) $(RGCOBJECTS) $(MTOBJECTS) $(MAPOPTION) \
 		$(ADLIBDIR)/$(LIBEUSGEO) $(ADLIBDIR)/$(LIBEUSX) 
 	($(CC) -o $(BINDIR)/eus $(LDFLAGS)  \
 		$(NOKOBJECTS) $(KOBJECTS) $(KSOBJECTS) \
@@ -270,7 +270,7 @@
 		$(EUSLIB) $(EUSXLIB) $(GEOLIB) $(IMGLIB) $(EDGELIB) $(XLIB) $(RAWLIB))
 
 $(BINDIR)/eusgl:	 $(NOKOBJECTS) $(KOBJECTS) $(KSOBJECTS) $(LOBJECTS) \
-		$(LCOBJECTS) $(COMPOBJECTS)  \
+		$(LCOBJECTS) $(COMPOBJECTS)  $(MAPOPTION) \
 		$(ADLIBDIR)/$(LIBEUSGEO) $(ADLIBDIR)/$(LIBEUSX) $(ADLIBDIR)/$(LIBEUSGL) 
 	($(CC) -o $(BINDIR)/eusgl $(LDFLAGS)  \
 		$(NOKOBJECTS) $(KOBJECTS) $(KSOBJECTS) \
@@ -319,7 +319,7 @@
         $(CC) -c -o $(OBJDIR)/constants.l.o $(CFLAGS) constants.l.c; \
 	 $(BINDIR)/gccls eusstart.l; \
         $(CC) -c $(CFLAGS) -o $(OBJDIR)/eusstart.l.o eusstart.l.c)
-$(LOBJECTS):
+$(LOBJECTS) $(MAPOPTION):
 	(echo $*; $(BINDIR)/euscomp <$(TOOLDIR)/compile_l.l)
 $(COMPOBJECTS):	$(GCCLS)
 	($(BINDIR)/euscomp <$(TOOLDIR)/compile_comp.l ; \

Modified: trunk/EusLisp/lisp/c/calleus.c
===================================================================
--- trunk/EusLisp/lisp/c/calleus.c	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/calleus.c	2013-07-28 07:36:49 UTC (rev 648)
@@ -27,7 +27,7 @@
 #include "eus.h"
 
 struct foreignpod {
-#if vax || sun4 || news || mips || i386 || alpha || x86_64
+#if vax || sun4 || news || mips || i386 || alpha || x86_64 || ARM
     unsigned mark:1;
     unsigned b:1;
     unsigned m:1;

Modified: trunk/EusLisp/lisp/c/eus.c
===================================================================
--- trunk/EusLisp/lisp/c/eus.c	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/eus.c	2013-07-28 07:36:49 UTC (rev 648)
@@ -911,6 +911,9 @@
 #if x86_64
   p=cons(ctx,intern(ctx,"X86_64",6,keywordpkg),p);
 #endif
+#if ARM
+  p=cons(ctx,intern(ctx,"ARM",3,keywordpkg),p);
+#endif
 
   defvar(ctx,"*FEATURES*",p,lisppkg);
 

Modified: trunk/EusLisp/lisp/c/eus.h
===================================================================
--- trunk/EusLisp/lisp/c/eus.h	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/eus.h	2013-07-28 07:36:49 UTC (rev 648)
@@ -369,7 +369,7 @@
 /****************************************************************/
 typedef 
   struct cell {
-#if vax || sun4 || news || mips || i386 || i486 || i586 || alpha || x86_64
+#if vax || sun4 || news || mips || i386 || i486 || i586 || alpha || x86_64 || ARM
     unsigned mark:1;
     unsigned b:1;
     unsigned m:1;
@@ -733,7 +733,7 @@
 #define bpointerof(p) ((bpointer)((eusinteger_t)(p)-2))
 #endif
 
-#if vax || sun4 || news || mips || i386 || i486 || i586 || alpha || x86_64
+#if vax || sun4 || news || mips || i386 || i486 || i586 || alpha || x86_64 || ARM
 
 #define makepointer(bp) ((pointer)((eusinteger_t)(bp)))
 // #define isint(p) (((eusinteger_t)(p) & 3)==2) // org
@@ -792,7 +792,7 @@
 #define bixof(p) (bpointerof(p)->h.bix)
 #endif
 
-#if sun3 || sun4 || system5 || apollo || news || sanyo || vxworks || mips || NEXT || i386 || i486 || i586 || x86_64
+#if sun3 || sun4 || system5 || apollo || news || sanyo || vxworks || mips || NEXT || i386 || i486 || i586 || x86_64 || ARM
 #if x86_64
 #define fltval(p) (nu.ival=((eusinteger_t)(p) & ~3L), nu.fval)
 #define makeflt(f) (nu.fval=(eusfloat_t)(f), (pointer)((nu.ival & ~3L) | 1L))

Modified: trunk/EusLisp/lisp/c/eusstream.c
===================================================================
--- trunk/EusLisp/lisp/c/eusstream.c	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/eusstream.c	2013-07-28 07:36:49 UTC (rev 648)
@@ -88,7 +88,7 @@
 #if system5 || Solaris2
       if (c<0) { breakck; goto tryqread;}
 #endif
-#if sun3 || sun4 || vax || apollo || news || sanyo || mips || i386 || alpha || x86_64
+#if sun3 || sun4 || vax || apollo || news || sanyo || mips || i386 || alpha || x86_64 || ARM
       breakck;
 #endif
       s->c.stream.buffer->c.str.length=lsave;

Modified: trunk/EusLisp/lisp/c/printer.c
===================================================================
--- trunk/EusLisp/lisp/c/printer.c	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/printer.c	2013-07-28 07:36:49 UTC (rev 648)
@@ -556,7 +556,7 @@
   if (isnum(x)) { printnum(ctx,x,f,intval(Spevalof(PRINTBASE)),0,0); return;}
   else if (x==UNBOUND) { writestr(f,(byte *)"***UNBOUND***",13); return;}
   /*pointed object*/
-#if vax || sun4 || news || mips || i386 || alpha || x86_64
+#if vax || sun4 || news || mips || i386 || alpha || x86_64  || ARM
   if ((x<(pointer)(ctx->stack)) && ((pointer)(ctx->stacklimit)<x)){
 	printint(ctx,(eusinteger_t)x,f,intval(Spevalof(PRINTBASE)),0,0); return;}
 #endif

Modified: trunk/EusLisp/lisp/c/reader.c
===================================================================
--- trunk/EusLisp/lisp/c/reader.c	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/reader.c	2013-07-28 07:36:49 UTC (rev 648)
@@ -188,8 +188,12 @@
 #if IRIX || Linux_ppc
 #define Char int
 #else
+#if ARM
+#define Char signed char
+#else
 #define Char char
 #endif
+#endif
 
 static Char skip(ctx, f, ch)
 context *ctx;
@@ -264,7 +268,7 @@
 #if sun3 ||( !alpha && system5 ) || sanyo
   labp->c.lab.unsolved=(pointer)addr;
 #endif
-#if sun4 || vax || news || mips || alpha || i386 || x86_64
+#if sun4 || vax || news || mips || alpha || i386 || x86_64 || ARM
   { eusinteger_t i;
     i=(((eusinteger_t)addr)>>2);
     labp->c.lab.unsolved=makeint(i);}

Modified: trunk/EusLisp/lisp/c/unixcall.c
===================================================================
--- trunk/EusLisp/lisp/c/unixcall.c	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/c/unixcall.c	2013-07-28 07:36:49 UTC (rev 648)
@@ -447,7 +447,7 @@
   return(makeint(alarm(ckintval(argv[0]))));}
 
 
-#if sun3 || sun4 || news || sanyo  || alpha || i386 || x86_64
+#if sun3 || sun4 || news || sanyo  || alpha || i386 || x86_64 || ARM
 #if !Solaris2
 pointer UALARM(ctx,n,argv)
 register context *ctx;
@@ -621,7 +621,7 @@
   }
 #endif
 
-#if sun3 || sun4 || vax || news || sanyo || (mips && !IRIX && !IRIX6) || i386 || alpha || x86_64
+#if sun3 || sun4 || vax || news || sanyo || (mips && !IRIX && !IRIX6) || i386 || alpha || x86_64 || ARM
 pointer VFORK(ctx,n,argv)
 register context *ctx;
 int n;
@@ -1341,7 +1341,7 @@
   if (envval) return(makestring(envval,strlen(envval)));
   else return(NIL);}
 
-#if sun3 || sun4 || vax || mips || i386 || alpha || x86_64
+#if sun3 || sun4 || vax || mips || i386 || alpha || x86_64 || ARM
 pointer PUTENV(ctx,n,argv)
 register context *ctx;
 int n;
@@ -2040,7 +2040,7 @@
   defun(ctx,"GETTIMEOFDAY",mod,GETTIMEOFDAY);
   defun(ctx,"ALARM",mod,ALARM);
 
-#if sun3 || sun4 || news || sanyo || alpha || x86_64 /* why i386 does not exist? */
+#if sun3 || sun4 || news || sanyo || alpha || x86_64 || ARM /* why i386 does not exist? */
 #if !Solaris2
   defun(ctx,"UALARM",mod,UALARM);
 #endif
@@ -2115,7 +2115,7 @@
   defun(ctx,"NTOHS",mod,N2HS);
 #endif
 
-#if sun3 || sun4 || vax || news || sanyo || (mips && !IRIX && !IRIX6) || i386 || alpha || x86_64
+#if sun3 || sun4 || vax || news || sanyo || (mips && !IRIX && !IRIX6) || i386 || alpha || x86_64 || ARM
   defun(ctx,"VFORK",mod,VFORK);
 #endif
   defun(ctx,"EXEC",mod,EXEC);
@@ -2124,7 +2124,7 @@
   defun(ctx,"SETPRIORITY",mod,SETPRIORITY);
 #endif
 
-#if sun3 || sun4 || vax || mips || i386 || alpha || x86_64
+#if sun3 || sun4 || vax || mips || i386 || alpha || x86_64 || ARM
   defun(ctx,"PUTENV",mod,PUTENV);
 #endif
 #if sun3 || sun4 && !Solaris2 || Linux || alpha || Cygwin

Modified: trunk/EusLisp/lisp/comp/comp.l
===================================================================
--- trunk/EusLisp/lisp/comp/comp.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/comp/comp.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -1313,9 +1313,12 @@
 			      " -DDarwin -Dx86_64 -DLinux -w -malign-functions=8 "
 			    " -DDarwin -Di386 -DLinux -w -malign-functions=4 "))
 		   	 ((and (memq :linux *features*)  (memq :gcc3 *features*))
-			  (if (memq :x86_64 *features*)
-				" -Dx86_64 -DLinux -Wimplicit -falign-functions=8 -DGCC3 "
-				" -Di386 -DLinux -Wimplicit -falign-functions=4 -DGCC3 "))
+			  (cond
+                           ((memq :x86_64 *features*)
+                            " -Dx86_64 -DLinux -Wimplicit -falign-functions=8 -DGCC3 ")
+                           ((memq :arm *features*)
+                            " -DARM -DLinux -Wimplicit -falign-functions=4 -DGCC3 ")
+                           (t " -Di386 -DLinux -Wimplicit -falign-functions=4 -DGCC3 ")))
 		   	 ((memq :linux *features*)
 			  (if (memq :x86_64 *features)
 				" -Dx86_64 -DLinux -Wimplicit -malign-functions=8 "

Modified: trunk/EusLisp/lisp/comp/trans.l
===================================================================
--- trunk/EusLisp/lisp/comp/trans.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/comp/trans.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -454,7 +454,7 @@
 	   (send self :store "w")
 	   (when (memq op '(+ -))
 	      (format cfile
-		 "#if sun4 || vax || mips || i386 || alpha || x86_64~%	w=(pointer)((eusinteger_t)w-2);~%#endif~%"))
+		 "#if sun4 || vax || mips || i386 || alpha || x86_64 || ARM~%	w=(pointer)((eusinteger_t)w-2);~%#endif~%"))
 	   (send self :push
 		 (format nil "(pointer)((eusinteger_t)~A ~A (eusinteger_t)w)"
 			 (send self :pop) 

Modified: trunk/EusLisp/lisp/tool/compile_comp.l
===================================================================
--- trunk/EusLisp/lisp/tool/compile_comp.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/tool/compile_comp.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -18,8 +18,12 @@
 	    ((member :darwin *features*) "../../Darwin/obj/")
 	    ((member :sh4 *features*) "../../LinuxSH4/obj/")
             ((member :linux *features*)
-             (if (member :x86_64 *features*)
-                 "../../Linux64/obj/" "../../Linux/obj/"))
+             (cond
+              ((member :x86_64 *features*)
+               "../../Linux64/obj/")
+              ((member :arm *features*)
+               "../../LinuxARM/obj/")
+              (t "../../Linux/obj/")))
 	    ((member :SunOS4.1 *features*) "../../SunOS4/obj/")
 	    ((member :Windows *features*) "../../Windows/obj/")
 	    ((member :Windows95 *features*) "../../Win95/obj/")

Modified: trunk/EusLisp/lisp/tool/compile_geo.l
===================================================================
--- trunk/EusLisp/lisp/tool/compile_geo.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/tool/compile_geo.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -17,8 +17,12 @@
 	    ((member :darwin *features*) "../../Darwin/obj/")
 	    ((member :sh4 *features*) "../../LinuxSH4/obj/")
             ((member :linux *features*)
-             (if (member :x86_64 *features*)
-                 "../../Linux64/obj/" "../../Linux/obj/"))
+             (cond
+              ((member :x86_64 *features*)
+               "../../Linux64/obj/")
+              ((member :arm *features*)
+               "../../LinuxARM/obj/")
+              (t "../../Linux/obj/")))
 	    ((member :SunOS4.1 *features*) "../../SunOS4/obj/")
 	    ((member :Windows *features*) "../../Windows/obj/")
 	    ((member :Windows95 *features*) "../../Win95/obj/")

Modified: trunk/EusLisp/lisp/tool/compile_gl.l
===================================================================
--- trunk/EusLisp/lisp/tool/compile_gl.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/tool/compile_gl.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -19,8 +19,12 @@
 	    ((member :irix6 *features*) "../../../IRIX6/obj/")
 	    ((member :darwin *features*) "../../../Darwin/obj/")
             ((member :linux *features*)
-             (if (member :x86_64 *features*)
-                 "../../../Linux64/obj/" "../../../Linux/obj/"))
+             (cond
+              ((member :x86_64 *features*)
+               "../../../Linux64/obj/")
+              ((member :arm *features*)
+               "../../../LinuxARM/obj/")
+              (t "../../../Linux/obj/")))
 	    ((member :SunOS4.1 *features*) "../../../SunOS4/obj/")
 	    ((member :Windows *features*) "../../../Windows/obj/")
 	    ((member :Windows95 *features*) "../../../Win95/obj/")

Modified: trunk/EusLisp/lisp/tool/compile_image.l
===================================================================
--- trunk/EusLisp/lisp/tool/compile_image.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/tool/compile_image.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -22,8 +22,12 @@
 	    ((member :darwin *features*) "../../Darwin/obj/")
 	    ((member :sh4 *features*) "../../LinuxSH4/obj/")
             ((member :linux *features*)
-             (if (member :x86_64 *features*)
-                 "../../Linux64/obj/" "../../Linux/obj/"))
+             (cond
+              ((member :x86_64 *features*)
+               "../../Linux64/obj/")
+              ((member :arm *features*)
+               "../../LinuxARM/obj/")
+              (t "../../Linux/obj/")))
 	    ((member :SunOS4.1 *features*) "../../SunOS4/obj/")
 	    ((member :Windows *features*) "../../Windows/obj/")
 	    ((member :Windows95 *features*) "../../Win95/obj/")

Modified: trunk/EusLisp/lisp/tool/compile_l.l
===================================================================
--- trunk/EusLisp/lisp/tool/compile_l.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/tool/compile_l.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -17,8 +17,12 @@
 	    ((member :darwin *features*) "../../Darwin/obj/")
 	    ((member :sh4 *features*) "../../LinuxSH4/obj/")
 	    ((member :linux *features*)
-             (if (member :x86_64 *features*)
-                 "../../Linux64/obj/" "../../Linux/obj/"))
+             (cond
+              ((member :x86_64 *features*)
+               "../../Linux64/obj/")
+              ((member :arm *features*)
+               "../../LinuxARM/obj/")
+              (t "../../Linux/obj/")))
 	    ((member :SunOS4.1 *features*) "../../SunOS4/obj/")
 	    ((member :Windows *features*) "../../Windows/obj/")
 	    ((member :Windows95 *features*) "../../Win95/obj/")

Modified: trunk/EusLisp/lisp/tool/compile_xwindow.l
===================================================================
--- trunk/EusLisp/lisp/tool/compile_xwindow.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/tool/compile_xwindow.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -16,8 +16,12 @@
 	    ((member :irix6 *features*) "../../IRIX6/obj/")
 	    ((member :darwin *features*) "../../Darwin/obj/")
             ((member :linux *features*)
-             (if (member :x86_64 *features*)
-                 "../../Linux64/obj/" "../../Linux/obj/"))
+             (cond
+              ((member :x86_64 *features*)
+               "../../Linux64/obj/")
+              ((member :arm *features*)
+               "../../LinuxARM/obj/")
+              (t "../../Linux/obj/")))
 	    ((member :SunOS4.1 *features*) "../../SunOS4/obj/")
 	    ((member :Windows *features*) "../../Windows/obj/")
 	    ((member :Windows95 *features*) "../../Win95/obj/")

Modified: trunk/EusLisp/lisp/xwindow/Xgraphics.l
===================================================================
--- trunk/EusLisp/lisp/xwindow/Xgraphics.l	2013-07-15 23:59:14 UTC (rev 647)
+++ trunk/EusLisp/lisp/xwindow/Xgraphics.l	2013-07-28 07:36:49 UTC (rev 648)
@@ -200,9 +200,9 @@
 		    direction font_ascent font_descent overall)
   (integer-vector (c-int font_ascent)
 		  (c-int font_descent)
-#-(or :i386 :alpha :x86_64)
+#-(or :i386 :alpha :x86_64 :arm)
 		%(overall [ 4 ] * 256 + overall [ 5 ])
-#+(or :i386 :alpha :x86_64)
+#+(or :i386 :alpha :x86_64 :arm)
 		%(overall [ 5 ] * 256 + overall [ 4 ])
 		)))
 	#| return = (ascent descent width) |#

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

<< < 1 2 3 4 .. 6 > >> (Page 2 of 6)

2013	Jan	Feb	Mar	Apr (31)	May (50)	Jun (6)	Jul (8)	Aug (4)	Sep (2)	Oct (4)	Nov (6)	Dec
2014	Jan (24)	Feb (2)	Mar	Apr	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec