Skip to content

Commit

Permalink
Adding tube project
Browse files Browse the repository at this point in the history
  • Loading branch information
Vidal Toboso committed Jun 21, 2013
1 parent b2f8b5a commit 0f90806
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Expand Up @@ -23,6 +23,7 @@ target
.xcodeproj/ !*.xcodeproj/project.pbxproj
*.xcactivitylog
*.d
*/bin/

converter/compile_errors.txt

Expand All @@ -39,4 +40,8 @@ Android/G3MAndroidSDK/gen/
Android/G3MAndroidDemo/bin/
Android/G3MAndroidDemo/gen/

JavaDesktop/G3MJavaDesktopSDK/bin/

Commons/G3MSharedSDK/bin

iOS/G3MiOSSDK/Commons/Debug
2 changes: 1 addition & 1 deletion Blender/io_scene_scenejs/__init__.py
Expand Up @@ -176,7 +176,7 @@ def execute(self, context):
axis_conversion(to_forward=self.axis_forward,
to_up=self.axis_up,
).to_4x4())

print("= Global Matrix =" + str(global_matrix))
keywords["global_matrix"] = global_matrix
return export_scenejs.save(self, context, **keywords)

Expand Down
2 changes: 1 addition & 1 deletion Blender/io_scene_scenejs/export_scenejs.py
Expand Up @@ -347,7 +347,7 @@ def veckey2d(v):

if me is None:
continue

me.transform(EXPORT_GLOBAL_MATRIX * ob_mat)

if EXPORT_UV:
Expand Down
6 changes: 5 additions & 1 deletion Commons/G3MSharedSDK/.classpath
Expand Up @@ -2,6 +2,10 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
4 changes: 2 additions & 2 deletions Commons/G3MSharedSDK/.settings/org.eclipse.jdt.core.prefs
Expand Up @@ -5,7 +5,7 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
Expand Down Expand Up @@ -92,4 +92,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=1.7
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="G3MSharedSDK">
<wb-resource deploy-path="/" source-path="/src"/>
</wb-module>
</project-modules>
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="java"/>
<fixed facet="jst.utility"/>
<installed facet="jst.utility" version="1.0"/>
<installed facet="java" version="1.7"/>
</faceted-project>
@@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="G3MJavaDesktopSDK">
<wb-resource deploy-path="/" source-path="/src"/>
</wb-module>
</project-modules>
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="java"/>
<fixed facet="jst.utility"/>
<installed facet="java" version="1.6"/>
<installed facet="jst.utility" version="1.0"/>
</faceted-project>

0 comments on commit 0f90806

Please sign in to comment.