Permalink
Browse files

refactor ar assets and add newest version of framework

  • Loading branch information...
1 parent db113de commit aae744b6c6b462f07fdddab6ec3200ddd39024e8 @azeitler azeitler committed Jan 15, 2012
Showing with 1,838 additions and 13,891 deletions.
  1. +2 −1 .gitignore
  2. BIN ARAssets/Additional (Sources)/ImageLabel_2x.psd
  3. BIN ARAssets/Additional/PoiLabelWithImage.png
  4. +0 −388 ARAssets/Additional/PoiLabelWithImage.xib
  5. BIN ARAssets/Additional/PoiLabelWithImage@2x-mask.png
  6. BIN ARAssets/Additional/PoiLabelWithImage@2x.png
  7. +0 −388 ARAssets/Additional/PoiLabelWithImage@2x.xib
  8. +0 −10,140 ARAssets/Additional/building.obj
  9. BIN ARAssets/Additional/building.png
  10. +0 −50 ARAssets/Additional/cube1.obj
  11. +0 −300 ARAssets/Additional/scale.obj
  12. BIN ARAssets/Additional/scale1.png
  13. BIN ARAssets/Additional/scale2.png
  14. BIN ARAssets/{Required → }/DefaultImage.png
  15. BIN ARAssets/DefaultPoiLabel.png
  16. +60 −67 ARAssets/{Required → }/DefaultPoiLabel.xib
  17. BIN ARAssets/DefaultPoiLabel@2x.png
  18. +0 −29 ARAssets/Localizable.strings
  19. BIN ARAssets/PoiLabelWithImage.png
  20. +71 −81 ARAssets/{Required/DefaultPoiLabel@2x.xib → PoiLabelWithImage.xib}
  21. BIN ARAssets/PoiLabelWithImage@2x.png
  22. BIN ARAssets/{Additional/cube.png → RadarDot.png}
  23. BIN ARAssets/{Additional/PoiLabelWithImage-mask.png → RadarDot@2x.png}
  24. BIN ARAssets/{Required/radar-screen.png → RadarScreen.png}
  25. BIN ARAssets/RadarScreen@2x.png
  26. BIN ARAssets/Required (Sources)/DefaultMarker.psd
  27. BIN ARAssets/Required (Sources)/DefaultMarker_2x.psd
  28. BIN ARAssets/Required (Sources)/DefaultMarker_mask.psd
  29. BIN ARAssets/Required/DefaultPoiLabel-mask.png
  30. BIN ARAssets/Required/DefaultPoiLabel.png
  31. BIN ARAssets/Required/DefaultPoiLabel@2x.png
  32. +0 −21 ARAssets/Required/msh_plane.obj
  33. BIN ARAssets/Required/radar-dot.png
  34. BIN ARAssets/Sources/DefaultPoiLabel.psd
  35. BIN ARAssets/{Additional (Sources)/ImageLabel_mask_2x.psd → Sources/PoiLabelWithImage.psd}
  36. BIN ARAssets/{Required (Sources)/RadarScreen_Dot.psd → Sources/RadarDot.psd}
  37. BIN ARAssets/{Required (Sources) → Sources}/RadarScreen.psd
  38. +135 −0 Framework-Debug/PanicARLib.framework/Versions/A/Headers/AR3DView.h
  39. +0 −46 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARBillboard.h
  40. +0 −17 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARConstants.h
  41. +0 −86 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARController+Assets.h
  42. +1 −3 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARController+Config.h
  43. +3 −3 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARController+Objects.h
  44. +2 −6 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARController+Sensors.h
  45. +47 −30 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARController.h
  46. +2 −2 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARControllerDelegate.h
  47. +0 −45 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARFreeObject.h
  48. +219 −7 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARMath.h
  49. +0 −30 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARMesh.h
  50. +0 −77 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARObject.h
  51. +44 −0 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARObjectDelegate.h
  52. +36 −3 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARPoi.h
  53. +31 −87 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARPoiLabel.h
  54. +24 −38 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARPoiLabelTemplate.h
  55. +0 −66 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARPoiObject.h
  56. +126 −0 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARRadarView.h
  57. +0 −32 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARTexture.h
  58. +0 −144 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARUtils.h
  59. +0 −60 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARVector.h
  60. +0 −16 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARView+Util.h
  61. +22 −123 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARView.h
  62. +41 −122 Framework-Debug/PanicARLib.framework/Versions/A/Headers/ARViewController.h
  63. +3 −13 Framework-Debug/PanicARLib.framework/Versions/A/Headers/PanicARLib.h
  64. +18 −0 Framework-Debug/PanicARLib.framework/Versions/A/Headers/UIImage+Resize.h
  65. +9 −0 Framework-Debug/PanicARLib.framework/Versions/A/Headers/UIImage+RoundedCorner.h
  66. BIN Framework-Debug/PanicARLib.framework/Versions/A/PanicARLib
  67. +3 −3 Framework-Debug/PanicARLib.framework/Versions/A/Resources/Info.plist
  68. +135 −0 Framework-Release/PanicARLib.framework/Versions/A/Headers/AR3DView.h
  69. +0 −46 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARBillboard.h
  70. +0 −17 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARConstants.h
  71. +0 −86 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARController+Assets.h
  72. +1 −3 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARController+Config.h
  73. +3 −3 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARController+Objects.h
  74. +2 −6 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARController+Sensors.h
  75. +47 −30 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARController.h
  76. +2 −2 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARControllerDelegate.h
  77. +0 −45 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARFreeObject.h
  78. +219 −7 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARMath.h
  79. +0 −30 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARMesh.h
  80. +0 −77 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARObject.h
  81. +44 −0 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARObjectDelegate.h
  82. +36 −3 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARPoi.h
  83. +31 −87 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARPoiLabel.h
  84. +24 −38 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARPoiLabelTemplate.h
  85. +0 −66 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARPoiObject.h
  86. +126 −0 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARRadarView.h
  87. +0 −32 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARTexture.h
  88. +0 −144 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARUtils.h
  89. +0 −60 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARVector.h
  90. +0 −16 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARView+Util.h
  91. +22 −123 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARView.h
  92. +41 −122 Framework-Release/PanicARLib.framework/Versions/A/Headers/ARViewController.h
  93. +3 −13 Framework-Release/PanicARLib.framework/Versions/A/Headers/PanicARLib.h
  94. +18 −0 Framework-Release/PanicARLib.framework/Versions/A/Headers/UIImage+Resize.h
  95. +9 −0 Framework-Release/PanicARLib.framework/Versions/A/Headers/UIImage+RoundedCorner.h
  96. BIN Framework-Release/PanicARLib.framework/Versions/A/PanicARLib
  97. +3 −3 Framework-Release/PanicARLib.framework/Versions/A/Resources/Info.plist
  98. +48 −109 PanicARDemo/PanicAR-Demo.xcodeproj/project.pbxproj
  99. +0 −84 ...mo/PanicAR-Demo.xcodeproj/xcuserdata/azeitler.xcuserdatad/xcschemes/PanicAR-Demo (Debug).xcscheme
  100. +0 −32 ...cARDemo/PanicAR-Demo.xcodeproj/xcuserdata/azeitler.xcuserdatad/xcschemes/xcschememanagement.plist
  101. +1 −1 PanicARDemo/PanicARDemo/AboutViewController.h
  102. +1 −1 PanicARDemo/PanicARDemo/AboutViewController.m
  103. +1 −1 PanicARDemo/PanicARDemo/AppDelegate.h
  104. +1 −1 PanicARDemo/PanicARDemo/AppDelegate.mm
  105. +1 −1 PanicARDemo/PanicARDemo/ConfigViewController.h
  106. +1 −1 PanicARDemo/PanicARDemo/ConfigViewController.mm
  107. +1 −6 PanicARDemo/PanicARDemo/MyARViewController.h
  108. +49 −69 PanicARDemo/PanicARDemo/MyARViewController.mm
  109. +33 −0 PanicARDemo/Scripts/build-package-ipa.sh
  110. +34 −0 PanicARDemo/Scripts/build-set-info.sh
  111. +1 −1 Readme.md
  112. +1 −1 framework-version.txt
View
@@ -5,4 +5,5 @@ build
*.pbxuser
.DS_Store
-PanicARDemo/PanicAR-Demo.xcodeproj/project.xcworkspace/
+PanicARDemo/PanicAR-Demo.xcodeproj/project.xcworkspace/
+PanicARDemo/PanicAR-Demo.xcodeproj/xcuserdata/*
Deleted file not rendered
Deleted file not rendered

Large diffs are not rendered by default.

Oops, something went wrong.
Deleted file not rendered
Deleted file not rendered

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit aae744b

Please sign in to comment.