Skip to content

Preview cam dev #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelcang merged 5 commits into from
Jul 30, 2018
Merged

Preview cam dev #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ca1105
some weird updates
justinusamwijaya Jul 28, 2018
3f7a320
some weird updates
justinusamwijaya Jul 29, 2018
5b7f5ad
first commit
justinusamwijaya Jul 30, 2018
bda66c4
add detect vertical
michaelcang Jul 30, 2018
d37d918
fix merge conflict
michaelcang Jul 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions RulAR.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,13 +463,13 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 76S5M4U4NF;
DEVELOPMENT_TEAM = 5A6FMYBMJ4;
INFOPLIST_FILE = RulAR/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = mcang.RulAR;
PRODUCT_BUNDLE_IDENTIFIER = justin.RulAR;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -481,13 +481,13 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 76S5M4U4NF;
DEVELOPMENT_TEAM = 5A6FMYBMJ4;
INFOPLIST_FILE = RulAR/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = mcang.RulAR;
PRODUCT_BUNDLE_IDENTIFIER = justin.RulAR;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
Binary file modified .../project.xcworkspace/xcuserdata/justinamwijaya.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
Binary file modified ...roject.xcworkspace/xcuserdata/marvincangcianno.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions RulAR/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES" initialViewController="pPe-Og-cG2">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
Expand Down Expand Up @@ -93,7 +93,7 @@
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="grid.png" id="jCO-NK-nEl">
<rect key="frame" x="0.0" y="71" width="138" height="128"/>
<rect key="frame" x="3" y="71" width="138" height="128"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
</subviews>
Expand Down
32 changes: 32 additions & 0 deletions RulAR/InputController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,38 @@ import UIKit

class InputController : UIViewController{

override func viewDidLoad() {
// let imageView = UIImageView(image: UIImage(named: "grid.png"))
// imageView.frame = view.bounds
// imageView.contentMode = UIViewContentMode.scaleAspectFill
// view.addSubview(imageView)
//
// let shape = CAShapeLayer()
// view.layer.addSublayer(shape)
// shape.opacity = 0.5
// shape.lineWidth = 2
// shape.lineJoin = kCALineJoinMiter
// shape.strokeColor = UIColor(hue: 0.786, saturation: 0.79, brightness: 0.53, alpha: 1.0).cgColor
// shape.fillColor = UIColor(hue: 0.786, saturation: 0.15, brightness: 0.89, alpha: 1.0).cgColor
//
// let path = UIBezierPath()
// path.move(to: CGPoint(x: 120, y: 20))
// path.addLine(to: CGPoint(x: 230, y: 90))
// path.addLine(to: CGPoint(x: 240, y: 250))
// path.addLine(to: CGPoint(x: 40, y: 280))
// path.addLine(to: CGPoint(x: 100, y: 150))
// path.close()
// shape.path = path.cgPath
//
//
// var myTextLayer = CATextLayer()
// myTextLayer.string = "My text"
// myTextLayer.foregroundColor = UIColor.black.cgColor
// myTextLayer.frame = imageView.bounds
// myTextLayer.position = CGPoint(x:200,y: 400)
// print(myTextLayer.frame)
// imageView.layer.addSublayer(myTextLayer)
}

var textValue : String!

Expand Down
Loading