Skip to content

Commit b54e0a8

Browse files
nyatlanyatla
committed
dataディレクトリをjar外へ移動
1 parent b6a9005 commit b54e0a8

File tree

17 files changed

+41
-37
lines changed

17 files changed

+41
-37
lines changed

‎examples/arPlusNyIdMarker/arPlusNyIdMarker.pde

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ void setup() {
2020
colorMode(RGB, 100);
2121
println(MultiMarker.VERSION);
2222
cam=new Capture(this,640,480);
23-
nya=new MultiMarker(this,width,height,"camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
24-
nya.addARMarker("patt.hiro",80);//id=0
25-
nya.addARMarker("patt.kanji",80);//id=1
23+
nya=new MultiMarker(this,width,height,"../../data/camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
24+
nya.addARMarker("../../data/patt.hiro",80);//id=0
25+
nya.addARMarker("../../data/patt.kanji",80);//id=1
2626
nya.addNyIdMarker(0,80);//id=2
2727
nya.addNyIdMarker(1,80);//id=3
2828
cam.start();

‎examples/imagePickup/imagePickup.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ void setup() {
2121
colorMode(RGB, 100);
2222
println(MultiMarker.VERSION);
2323
cam=new Capture(this,640,480);
24-
nya=new MultiMarker(this,width,height,"camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
25-
nya.addARMarker("patt.hiro",80);//id=0
24+
nya=new MultiMarker(this,width,height,"../../data/camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
25+
nya.addARMarker("../../data/patt.hiro",80);//id=0
2626
cam.start();
2727

2828
}

‎examples/markerPlane/markerPlane.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ void setup() {
2020
size(640,480,P3D);
2121
colorMode(RGB, 100);
2222
cam=new Capture(this,640,480);
23-
nya=new MultiMarker(this,width,height,"camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
24-
nya.addARMarker("patt.hiro",80);//id=0
23+
nya=new MultiMarker(this,width,height,"../../data/camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
24+
nya.addARMarker("../../data/patt.hiro",80);//id=0
2525
cam.start();
2626
}
2727

‎examples/multiMarker/multiMarker.pde

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ void setup() {
1919
colorMode(RGB, 100);
2020
println(MultiMarker.VERSION);
2121
cam=new Capture(this,640,480);
22-
nya=new MultiMarker(this,width,height,"camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
23-
nya.addARMarker("patt.hiro",80);//id=0
24-
nya.addARMarker("patt.kanji",80);//id=1
22+
nya=new MultiMarker(this,width,height,"../../data/camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
23+
nya.addARMarker("../../data/patt.hiro",80);//id=0
24+
nya.addARMarker("../../data/patt.kanji",80);//id=1
2525
cam.start();
2626
}
2727

‎examples/nonBeginSequence/nonBeginSequence.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ void setup() {
2020
size(640,480,P3D);
2121
colorMode(RGB, 100);
2222
println(MultiMarker.VERSION);
23-
nya=new MultiMarker(this,width,height,"camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
24-
nya.addARMarker("patt.hiro",80);//id=0
23+
nya=new MultiMarker(this,width,height,"../../data/camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
24+
nya.addARMarker("../../data/patt.hiro",80);//id=0
2525
nya.setARPerspective();
2626
cam=new Capture(this,640,480);
2727
cr=cg=cb=100;

‎examples/pngMarker/pngMarker.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ void setup() {
2121
colorMode(RGB, 100);
2222
println(MultiMarker.VERSION);
2323
cam=new Capture(this,640,480);
24-
nya=new MultiMarker(this,width,height,"camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
25-
nya.addARMarker(loadImage("hiro.png"),16,25,80);
24+
nya=new MultiMarker(this,width,height,"../../data/camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
25+
nya.addARMarker(loadImage("../../data/hiro.png"),16,25,80);
2626
cam.start();
2727
}
2828

‎examples/rotation/rotation.pde

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ void setup() {
2525

2626
//キャプチャを作成
2727
cam=new Capture(this,640,480);
28-
nya_l=new MultiMarker(this,width,height,"camera_para.dat",new NyAR4PsgConfig(NyAR4PsgConfig.CS_LEFT_HAND,NyAR4PsgConfig.TM_NYARTK));
29-
nya_l.addARMarker("patt.hiro",80);
28+
nya_l=new MultiMarker(this,width,height,"../../data/camera_para.dat",new NyAR4PsgConfig(NyAR4PsgConfig.CS_LEFT_HAND,NyAR4PsgConfig.TM_NYARTK));
29+
nya_l.addARMarker("../../data/patt.hiro",80);
3030

31-
nya_r=new MultiMarker(this,width,height,"camera_para.dat",new NyAR4PsgConfig(NyAR4PsgConfig.CS_RIGHT_HAND,NyAR4PsgConfig.TM_NYARTK));
32-
nya_r.addARMarker("patt.kanji",80);
31+
nya_r=new MultiMarker(this,width,height,"../../data/camera_para.dat",new NyAR4PsgConfig(NyAR4PsgConfig.CS_RIGHT_HAND,NyAR4PsgConfig.TM_NYARTK));
32+
nya_r.addARMarker("../../data/patt.kanji",80);
3333
cam.start();
3434
}
3535

‎examples/simpleLite/simpleLite.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ void setup() {
2020
colorMode(RGB, 100);
2121
println(MultiMarker.VERSION);
2222
cam=new Capture(this,640,480);
23-
nya=new MultiMarker(this,width,height,"camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
24-
nya.addARMarker("patt.hiro",80);
23+
nya=new MultiMarker(this,width,height,"../../data/camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
24+
nya.addARMarker("../../data/patt.hiro",80);
2525
cam.start();
2626
}
2727

‎examples/simpleNft/simpleNft.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ void setup() {
1717
colorMode(RGB, 100);
1818
println(MultiMarker.VERSION);
1919
cam=new Capture(this,640,480);
20-
nya=new MultiNft(this,width,height,"camera_para5.dat",NyAR4PsgConfig.CONFIG_PSG);
21-
nya.addNftTarget("infinitycat",160);//id=0
20+
nya=new MultiNft(this,width,height,"../../data/camera_para5.dat",NyAR4PsgConfig.CONFIG_PSG);
21+
nya.addNftTarget("../../data/infinitycat",160);//id=0
2222
cam.start();
2323
}
2424

‎examples/simpleNyId/simpleNyId.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void setup() {
1919
colorMode(RGB, 100);
2020
println(MultiMarker.VERSION);
2121
cam=new Capture(this,640,480);
22-
nya=new MultiMarker(this,width,height,"camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
22+
nya=new MultiMarker(this,width,height,"../../data/camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
2323
nya.addNyIdMarker(0,80);
2424
cam.start();
2525
}

‎examples/test/MultiMarkerTest/MultiMarkerTest.pde

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ void setup() {
1414
size(640,480,P3D);
1515
colorMode(RGB, 100);
1616
cam=new Capture(this,width,height);
17-
nya=new MultiMarker(this,width,height,"camera_para.dat",new NyAR4PsgConfig(NyAR4PsgConfig.CS_RIGHT_HAND,NyAR4PsgConfig.TM_NYARTK));
17+
nya=new MultiMarker(this,width,height,"../../data/camera_para.dat",new NyAR4PsgConfig(NyAR4PsgConfig.CS_RIGHT_HAND,NyAR4PsgConfig.TM_NYARTK));
1818
nya.setARClipping(100,1000);
1919
nya.setConfidenceThreshold(0.6);
20-
nya.addARMarker("patt.hiro",80);
21-
nya.addARMarker("patt.kanji",80);
20+
nya.addARMarker("../../data/patt.hiro",80);
21+
nya.addARMarker("../../data/patt.kanji",80);
2222
nya.addNyIdMarker(31,80);
2323
println(nya.VERSION); //バージョンの表示
2424
cam.start();
@@ -136,5 +136,4 @@ void drawgrid()
136136
line(0,0,0,0,0,100);
137137
textFont(font,20.0); text("Z",0,0,100);
138138
popMatrix();
139-
}
140-
139+
}

‎examples/withOpenGL/withOpenGL.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ void setup() {
2525
colorMode(RGB, 100);
2626
println(MultiMarker.VERSION);
2727
cam=new Capture(this,640,480);
28-
nya=new MultiMarker(this,width,height,"camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
29-
nya.addARMarker("patt.hiro",80);//id=0
28+
nya=new MultiMarker(this,width,height,"../../data/camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
29+
nya.addARMarker("../../data/patt.hiro",80);//id=0
3030

3131
//ProjectionMatrixをOpenGLスタイルの行列で得る
3232
PMatrix3D m=nya.getProjectionMatrix().get();

‎examples/withPicking/withPicking.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ void setup() {
3030
println(MultiMarker.VERSION);
3131
size(640,480,P3D);
3232
colorMode(RGB, 100);
33-
nya=new MultiMarker(this,width,height,"camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
34-
nya.addARMarker("patt.hiro",80);//id=0
33+
nya=new MultiMarker(this,width,height,"../../data/camera_para.dat",NyAR4PsgConfig.CONFIG_PSG);
34+
nya.addARMarker("../../data/patt.hiro",80);//id=0
3535
picker = new Picker(this);
3636
cam=new Capture(this,640,480);
3737
cr=cg=cb=100;

‎resources/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ library.version=2
135135

136136
# The version as the user will see it.
137137

138-
library.prettyVersion=3.0.3
138+
library.prettyVersion=3.0.4
139139

140140

141141
# The min and max revision of Processing compatible with your library.

‎resources/build.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<property name="project.data" location="data"/>
4848
<property name="project.lib" location="lib"/>
4949
<property name="project.bin" location="bin"/>
50-
<property name="project.bin.data" location="${project.bin}/data"/>
50+
<!-- <property name="project.bin.data" location="${project.bin}/data"/> -->
5151
<property name="project.examples" location="examples"/>
5252
<property name="project.reference" location="reference"/>
5353
<property name="project.dist" location="distribution"/>
@@ -108,6 +108,7 @@ ${line}
108108
<antcall target="generate.jar"><param name="folder" value="library"/></antcall>
109109
<antcall target="generate.javadoc" />
110110
<antcall target="generate.libprops" />
111+
<antcall target="copyData" />
111112
<antcall target="copyToSketchbook"><param name="folder" value="libraries"/></antcall>
112113
<antcall target="generate.distribution" />
113114
<antcall target="generate.install.library" />
@@ -116,7 +117,11 @@ ${line}
116117
<delete dir="${project.tmp}"/>
117118
</target>
118119

119-
120+
<target name="copyData" if="is.normal">
121+
<copy todir="${project.tmp}/${project.name}/data">
122+
<fileset dir="${project.data}" />
123+
</copy>
124+
</target>
120125

121126
<target name="generate.libprops" if="is.normal">
122127
<property name="libprops.destination" location="${project.tmp}/${project.name}/library.properties"/>

‎resources/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ version = 2 # This must be parsable as an int
4545

4646
# The version as the user will see it. If blank, the version attribute will be
4747
# used here.
48-
prettyVersion = 3.0.0 # This is treated as a String
48+
prettyVersion = 3.0.4 # This is treated as a String
4949

5050
# The min and max revision of Processing compatible with your library.
5151
# Note that these fields use the revision and not the version of Processing,

‎src/src/jp/nyatla/nyar4psg/utils/NyARPsgBaseClass.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public abstract class NyARPsgBaseClass
5959
* バージョン文字列です。
6060
* NyAR4psgのバージョン情報を示します。
6161
*/
62-
final public static String VERSION = "NyAR4psg/3.0.3;"+NyARVersion.VERSION_STRING;
62+
final public static String VERSION = "NyAR4psg/3.0.4;"+NyARVersion.VERSION_STRING;
6363
/**　参照するAppletのインスタンスです。*/
6464
final protected PApplet _ref_papplet;
6565

0 commit comments

Comments
 (0)