Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…li3D

# Conflicts:
#	.idea/vcs.xml
  • Loading branch information
peterlin424 committed Oct 7, 2016
2 parents ab10603 + e21ebc7 commit 423f7e5
Show file tree
Hide file tree
Showing 80 changed files with 133,340 additions and 1,481 deletions.
6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ android {
targetSdkVersion 23
versionCode 1
versionName "1.0"

multiDexEnabled true
}
buildTypes {
release {
Expand All @@ -24,5 +26,4 @@ dependencies {
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.2.1'
compile 'org.rajawali3d:rajawali:1.0.186-SNAPSHOT@aar'
compile files('libs/Vuforia.jar')
}
31 changes: 27 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />


<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
Expand All @@ -31,11 +30,35 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".ARActivity"

<activity android:name=".ImageTargetActivity"
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity android:name=".CloudRecoActivity"
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity android:name=".FrameMarkerActivity"
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity android:name=".VirtualButtonActivity"
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity android:name=".UserDefinedTargetActivity"
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity android:name=".CylinderTargetActivity"
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity android:name=".CuboidTargetActivity"
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize"
android:launchMode="singleTask"
android:screenOrientation="portrait"
></activity>
android:screenOrientation="portrait" />
</application>

</manifest>
Binary file added app/src/main/assets/3dCuboid.dat
Binary file not shown.
33 changes: 33 additions & 0 deletions app/src/main/assets/3dCuboid.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<QCARConfig>
<Tracking>
<ImageTarget name="MaoBao.Bottom" size="675.000000 400.000000"/>
<ImageTarget name="MaoBao.Right" size="400.000000 725.000000"/>
<ImageTarget name="MaoBao.Front" size="675.000000 725.000000"/>
<ImageTarget name="MaoBao.Top" size="675.000000 400.000000"/>
<ImageTarget name="MaoBao.Back" size="675.000000 725.000000"/>
<ImageTarget name="MaoBao.Left" size="400.000000 725.000000"/>
<ImageTarget name="box1.Bottom" size="450.000000 450.000000"/>
<ImageTarget name="box1.Right" size="450.000000 1450.000000"/>
<ImageTarget name="box1.Front" size="450.000000 1450.000000"/>
<ImageTarget name="box1.Top" size="450.000000 450.000000"/>
<ImageTarget name="box1.Back" size="450.000000 1450.000000"/>
<ImageTarget name="box1.Left" size="450.000000 1450.000000"/>
<MultiTarget name="MaoBao">
<Part name="MaoBao.Left" translation="-337.5 0 0" rotation="AD: 0 1 0 -90"/>
<Part name="MaoBao.Right" translation="337.5 0 0" rotation="AD: 0 1 0 90"/>
<Part name="MaoBao.Front" translation="0 0 200.0" rotation="AD: 1 0 0 0"/>
<Part name="MaoBao.Back" translation="0 0 -200.0" rotation="AD: 0 1 0 180"/>
<Part name="MaoBao.Top" translation="0 362.5 0" rotation="AD: 1 0 0 -90"/>
<Part name="MaoBao.Bottom" translation="0 -362.5 0" rotation="AD: 1 0 0 90"/>
</MultiTarget>
<MultiTarget name="Box1">
<Part name="box1.Left" translation="-225.0 0 0" rotation="AD: 0 1 0 -90"/>
<Part name="box1.Right" translation="225.0 0 0" rotation="AD: 0 1 0 90"/>
<Part name="box1.Front" translation="0 0 225.0" rotation="AD: 1 0 0 0"/>
<Part name="box1.Back" translation="0 0 -225.0" rotation="AD: 0 1 0 180"/>
<Part name="box1.Top" translation="0 725.0 0" rotation="AD: 1 0 0 -90"/>
<Part name="box1.Bottom" translation="0 -725.0 0" rotation="AD: 1 0 0 90"/>
</MultiTarget>
</Tracking>
</QCARConfig>
Binary file added app/src/main/assets/3dCylinder.dat
Binary file not shown.
7 changes: 7 additions & 0 deletions app/src/main/assets/3dCylinder.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<QCARConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="qcar_config.xsd">
<Tracking>
<CylinderTarget name="cup" sideLength="373.000000"/>
<CylinderTarget name="fanta" sideLength="1132.000000"/>
</Tracking>
</QCARConfig>
Binary file added app/src/main/assets/DemoDatabase.dat
Binary file not shown.
9 changes: 9 additions & 0 deletions app/src/main/assets/DemoDatabase.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<QCARConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="qcar_config.xsd">
<Tracking>
<ImageTarget name="TestTarget" size="500.000000 312.121216" >
<VirtualButton name="red" sensitivity="HIGH" rectangle="-108.68 -53.52 -75.75 -80.87" enabled="true" />
<VirtualButton name="green" sensitivity="HIGH" rectangle="76.57 -53.52 109.50 -80.87" enabled="true" />
</ImageTarget>
</Tracking>
</QCARConfig>
Binary file added app/src/main/assets/DevelopTarget.dat
Binary file not shown.
7 changes: 7 additions & 0 deletions app/src/main/assets/DevelopTarget.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<QCARConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="qcar_config.xsd">
<Tracking>
<ImageTarget name="taiflex_logo-02" size="100.000000 129.462997" />
<ImageTarget name="Tool_06-B" size="100.000000 100.000000" />
</Tracking>
</QCARConfig>
Binary file added app/src/main/assets/LifeWater.dat
Binary file not shown.
14 changes: 14 additions & 0 deletions app/src/main/assets/LifeWater.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<QCARConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="qcar_config.xsd">
<Tracking>
<ImageTarget name="103110" size="100.000000 178.392487" />
<ImageTarget name="103109" size="100.000000 178.392487" />
<ImageTarget name="103108" size="100.000000 178.392487" />
<ImageTarget name="103107" size="100.000000 178.392487" />
<ImageTarget name="103106" size="100.000000 178.392487" />
<ImageTarget name="103105" size="100.000000 178.392487" />
<ImageTarget name="103104" size="100.000000 178.392487" />
<ImageTarget name="103103" size="100.000000 178.392487" />
<ImageTarget name="103102" size="100.000000 178.392487" />
</Tracking>
</QCARConfig>
Binary file modified app/src/main/assets/Watch.dat
Binary file not shown.
3 changes: 3 additions & 0 deletions app/src/main/assets/Watch.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<QCARConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="qcar_config.xsd">
<Tracking>
<ImageTarget name="mark-15" size="100.000000 100.000000" />
<ImageTarget name="mark-29" size="100.000000 100.000000" />
<ImageTarget name="low_resolution_image" size="100.000000 135.021103" />
<ImageTarget name="google-cloud" size="100.000000 75.024391" />
</Tracking>
</QCARConfig>
Loading

0 comments on commit 423f7e5

Please sign in to comment.