OSDN > Developer > hotshot5000 > Chamber > HotshotOnline > Commit

HotshotOnline
Fork

(Original repository, No fork origin)

Commit

Commit MetaInfo

Revision	6b925b6683070475a6ad810a9dc42c9b8125ffe9 (tree)
Time	2018-03-26 04:32:25
Author	sebastian_bugiu <sebastian_ <bugiu@head...>
Commiter	sebastian_bugiu <sebastian_

Log Message

Added jflex and CUP libraries.

Change Summary

modified: android/android.iml (diff)
modified: android/build.gradle (diff)
modified: android/src/main/jni/HotshotGorillaGUIScreenRenderable.cpp (diff)
modified: android/src/main/jni/HotshotGorillaGUIScreenRenderable.h (diff)
modified: core/build.gradle (diff)
modified: core/core.iml (diff)
modified: core/src/headwayEnt/blackholedarksun/APP_SinglePlayerGame.java (diff)
modified: desktop/desktop.iml (diff)
modified: ios-moe/ios-moe.iml (diff)
modified: ios/ios.iml (diff)

Incremental Difference

diff -r e78bddaaf609 -r 6b925b668307 android/android.iml

--- a/android/android.iml Tue Feb 27 01:41:23 2018 +0200

+++ b/android/android.iml Sun Mar 25 22:32:25 2018 +0300

		@@ -122,6 +122,16 @@
122	122	</content>
123	123	<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
124	124	<orderEntry type="sourceFolder" forTests="false" />
	125	+ <orderEntry type="library" name="de.jflex:jflex:1.6.1@jar" level="project" />
	126	+ <orderEntry type="library" name="com.badlogicgames.gdx:gdx-ai:1.8.0@jar" level="project" />
	127	+ <orderEntry type="library" name="org.apache.httpcomponents:httpcore:4.4.3@jar" level="project" />
	128	+ <orderEntry type="library" name="org.lwjgl.lwjgl:lwjgl_util:2.9.2@jar" level="project" />
	129	+ <orderEntry type="library" name="com.badlogicgames.ashley:ashley:1.7.0@jar" level="project" />
	130	+ <orderEntry type="library" name="org.jcraft:jorbis:0.0.17@jar" level="project" />
	131	+ <orderEntry type="library" name="net.java.jinput:jinput-platform:2.0.5:natives-osx@jar" level="project" />
	132	+ <orderEntry type="library" name="org.apache.httpcomponents:httpclient:4.5.1@jar" level="project" />
	133	+ <orderEntry type="library" name="commons-logging:commons-logging:1.2@jar" level="project" />
	134	+ <orderEntry type="library" name="org.lwjgl.lwjgl:lwjgl:2.9.2@jar" level="project" />
125	135	<orderEntry type="library" name="com.badlogicgames.jlayer:jlayer:1.0.1-gdx@jar" level="project" />
126	136	<orderEntry type="library" name="net.java.jinput:jinput-platform:2.0.5:natives-linux@jar" level="project" />
127	137	<orderEntry type="library" name="org.lwjgl.lwjgl:lwjgl-platform:2.9.2:natives-osx@jar" level="project" />

		@@ -130,21 +140,15 @@
130	140	<orderEntry type="library" name="com.badlogicgames.gdx:gdx-bullet:1.9.6@jar" level="project" />
131	141	<orderEntry type="library" name="net.java.jinput:jinput-platform:2.0.5:natives-windows@jar" level="project" />
132	142	<orderEntry type="library" name="net.java.jinput:jinput:2.0.5@jar" level="project" />
133		- <orderEntry type="library" name="com.badlogicgames.gdx:gdx-ai:1.8.0@jar" level="project" />
134	143	<orderEntry type="library" name="org.lwjgl.lwjgl:lwjgl-platform:2.9.2:natives-windows@jar" level="project" />
135	144	<orderEntry type="library" name="com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.8@jar" level="project" />
136		- <orderEntry type="library" name="org.apache.httpcomponents:httpcore:4.4.3@jar" level="project" />
137	145	<orderEntry type="library" name="commons-codec:commons-codec:1.9@jar" level="project" />
138	146	<orderEntry type="library" name="net.java.jutils:jutils:1.0.0@jar" level="project" />
139		- <orderEntry type="library" name="org.lwjgl.lwjgl:lwjgl_util:2.9.2@jar" level="project" />
140		- <orderEntry type="library" name="com.badlogicgames.ashley:ashley:1.7.0@jar" level="project" />
141		- <orderEntry type="library" name="org.jcraft:jorbis:0.0.17@jar" level="project" />
142		- <orderEntry type="library" name="net.java.jinput:jinput-platform:2.0.5:natives-osx@jar" level="project" />
	147	+ <orderEntry type="library" name="org.apache.ant:ant-launcher:1.7.0@jar" level="project" />
	148	+ <orderEntry type="library" name="org.apache.ant:ant:1.7.0@jar" level="project" />
143	149	<orderEntry type="library" name="com.badlogicgames.gdx:gdx-backend-android:1.9.6@jar" level="project" />
	150	+ <orderEntry type="library" name="nz.ac.waikato.cms.weka.thirdparty:java-cup-11b:2015.03.26@jar" level="project" />
144	151	<orderEntry type="library" name="com.badlogicgames.gdx:gdx:1.9.8@jar" level="project" />
145		- <orderEntry type="library" name="org.apache.httpcomponents:httpclient:4.5.1@jar" level="project" />
146		- <orderEntry type="library" name="commons-logging:commons-logging:1.2@jar" level="project" />
147		- <orderEntry type="library" name="org.lwjgl.lwjgl:lwjgl:2.9.2@jar" level="project" />
148	152	<orderEntry type="module" module-name="core" />
149	153	</component>
150	154	</module>
		\ No newline at end of file

diff -r e78bddaaf609 -r 6b925b668307 android/build.gradle

--- a/android/build.gradle Tue Feb 27 01:41:23 2018 +0200

+++ b/android/build.gradle Sun Mar 25 22:32:25 2018 +0300

		@@ -1,5 +1,5 @@
1	1	android {
2		- buildToolsVersion '27.0.3'
	2	+ buildToolsVersion '28.0.0-rc1'
3	3	compileSdkVersion 27
4	4	// useLibrary 'org.apache.http.legacy'
5	5	sourceSets {

diff -r e78bddaaf609 -r 6b925b668307 android/src/main/jni/HotshotGorillaGUIScreenRenderable.cpp

--- a/android/src/main/jni/HotshotGorillaGUIScreenRenderable.cpp Tue Feb 27 01:41:23 2018 +0200

+++ b/android/src/main/jni/HotshotGorillaGUIScreenRenderable.cpp Sun Mar 25 22:32:25 2018 +0300

		@@ -191,16 +191,16 @@
191	191	ScreenRenderable::mVisible = mVisible;
192	192	}
193	193
194		-// void ScreenRenderable::getRenderOperation(Ogre::v1::RenderOperation &op, bool casterPass) {
195		-//
	194	+// void ScreenRenderable::getRenderOperation(::Ogre::v1::RenderOperation &op, bool casterPass) {
	195	+// ::Ogre::v1::SimpleRenderable::getRenderOperation(op, casterPass);
196	196	// }
197	197
198	198	void ScreenRenderable::getWorldTransforms(::Ogre::Matrix4 *xform) const {
199	199	*xform = ::Ogre::Matrix4::IDENTITY;
200	200	}
201	201
202		-// const Ogre::LightList &ScreenRenderable::getLights(void) const {
203		-// return <#initializer#>;
	202	+// const ::Ogre::LightList &ScreenRenderable::getLights(void) const {
	203	+// return ::Ogre::v1::SimpleRenderable::getLights();
204	204	// }
205	205
206	206

diff -r e78bddaaf609 -r 6b925b668307 android/src/main/jni/HotshotGorillaGUIScreenRenderable.h

--- a/android/src/main/jni/HotshotGorillaGUIScreenRenderable.h Tue Feb 27 01:41:23 2018 +0200

+++ b/android/src/main/jni/HotshotGorillaGUIScreenRenderable.h Sun Mar 25 22:32:25 2018 +0300

		@@ -64,11 +64,11 @@
64	64
65	65	void setScreenRenderableVisible(bool mVisible);
66	66
67		-// virtual void getRenderOperation(Ogre::v1::RenderOperation &op, bool casterPass) override;
	67	+// virtual void getRenderOperation(::Ogre::v1::RenderOperation &op, bool casterPass);
68	68
69	69	virtual void getWorldTransforms(::Ogre::Matrix4 *xform) const;
70	70
71		-// virtual const Ogre::LightList &getLights(void) const;
	71	+// virtual const ::Ogre::LightList &getLights(void) const;
72	72	};
73	73	}
74	74

diff -r e78bddaaf609 -r 6b925b668307 core/build.gradle

--- a/core/build.gradle Tue Feb 27 01:41:23 2018 +0200

+++ b/core/build.gradle Sun Mar 25 22:32:25 2018 +0300

		@@ -44,6 +44,11 @@
44	44	//******************************************************************************
45	45
46	46	compile 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.8'
	47	+ // https://mvnrepository.com/artifact/de.jflex/jflex
	48	+ compile group: 'de.jflex', name: 'jflex', version: '1.6.1'
	49	+ // https://mvnrepository.com/artifact/nz.ac.waikato.cms.weka.thirdparty/java-cup-11b
	50	+ compile group: 'nz.ac.waikato.cms.weka.thirdparty', name: 'java-cup-11b', version: '2015.03.26'
	51	+
47	52	}
48	53
49	54

diff -r e78bddaaf609 -r 6b925b668307 core/core.iml

--- a/core/core.iml Tue Feb 27 01:41:23 2018 +0200

+++ b/core/core.iml Sun Mar 25 22:32:25 2018 +0300

		@@ -32,6 +32,8 @@
32	32	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-bullet-1.9.6" level="project" />
33	33	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-backend-lwjgl-1.9.8" level="project" />
34	34	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-1.9.8" level="project" />
	35	+ <orderEntry type="library" exported="" scope="PROVIDED" name="jflex-1.6.1" level="project" />
	36	+ <orderEntry type="library" exported="" scope="PROVIDED" name="java-cup-11b-2015.03.26" level="project" />
35	37	<orderEntry type="library" exported="" scope="PROVIDED" name="retrofit-1.9.0" level="project" />
36	38	<orderEntry type="library" exported="" scope="PROVIDED" name="gson-2.4" level="project" />
37	39	<orderEntry type="library" exported="" scope="PROVIDED" name="guava-18.0" level="project" />

		@@ -44,11 +46,13 @@
44	46	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-2.9.2" level="project" />
45	47	<orderEntry type="library" exported="" scope="PROVIDED" name="jlayer-1.0.1-gdx" level="project" />
46	48	<orderEntry type="library" exported="" scope="PROVIDED" name="jorbis-0.0.17" level="project" />
	49	+ <orderEntry type="library" exported="" scope="PROVIDED" name="ant-1.7.0" level="project" />
47	50	<orderEntry type="library" exported="" scope="PROVIDED" name="httpclient-4.5.1" level="project" />
48	51	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-platform-2.9.2-natives-windows" level="project" />
49	52	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-platform-2.9.2-natives-linux" level="project" />
50	53	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-platform-2.9.2-natives-osx" level="project" />
51	54	<orderEntry type="library" exported="" scope="PROVIDED" name="jinput-2.0.5" level="project" />
	55	+ <orderEntry type="library" exported="" scope="PROVIDED" name="ant-launcher-1.7.0" level="project" />
52	56	<orderEntry type="library" exported="" scope="PROVIDED" name="httpcore-4.4.3" level="project" />
53	57	<orderEntry type="library" exported="" scope="PROVIDED" name="commons-logging-1.2" level="project" />
54	58	<orderEntry type="library" exported="" scope="PROVIDED" name="commons-codec-1.9" level="project" />

		@@ -57,13 +61,5 @@
57	61	<orderEntry type="library" exported="" scope="PROVIDED" name="jinput-platform-2.0.5-natives-windows" level="project" />
58	62	<orderEntry type="library" exported="" scope="PROVIDED" name="jinput-platform-2.0.5-natives-osx" level="project" />
59	63	<orderEntry type="library" exported="" scope="PROVIDED" name="kryonet" level="project" />
60		- <orderEntry type="library" exported="" name="core.core-1.0" level="project" />
61		- <orderEntry type="library" exported="" name="core.core-1.0" level="project" />
62		- <orderEntry type="library" exported="" name="core.core-1.0" level="project" />
63		- <orderEntry type="library" exported="" name="core.core-1.0" level="project" />
64		- <orderEntry type="library" exported="" name="core.core-1.0" level="project" />
65		- <orderEntry type="library" exported="" name="core.core-1.0" level="project" />
66		- <orderEntry type="library" exported="" name="core.core-1.0" level="project" />
67		- <orderEntry type="library" exported="" name="core.core-1.0" level="project" />
68	64	</component>
69	65	</module>
		\ No newline at end of file

diff -r e78bddaaf609 -r 6b925b668307 core/src/headwayEnt/blackholedarksun/APP_SinglePlayerGame.java

--- a/core/src/headwayEnt/blackholedarksun/APP_SinglePlayerGame.java Tue Feb 27 01:41:23 2018 +0200

+++ b/core/src/headwayEnt/blackholedarksun/APP_SinglePlayerGame.java Sun Mar 25 22:32:25 2018 +0300

		@@ -62,7 +62,7 @@
62	62
63	63	// private MultiplayerEntityProcessingClientSystem multiplayerEntityProcessingClientSystem;
64	64
65		- private static final boolean FORCE_DATA_COPY = false;
	65	+ private static final boolean FORCE_DATA_COPY = true;
66	66
67	67	private WorldConfiguration spWorldConfiguration;
68	68	private WorldConfiguration mpWorldConfiguration;

		@@ -751,9 +751,13 @@
751	751
752	752	public void copyToLocalFolder(FileHandle internal) {
753	753	for (FileHandle fileHandle : internal.list()) {
754		-// if (!fileHandle.isDirectory()) {
	754	+ if (fileHandle.path().startsWith("/")) {
	755	+ fileHandle = Gdx.files.internal(fileHandle.path().substring(1));
	756	+ }
	757	+// if (!fileHandle.isDirectory()) {
	758	+// fileHandle = Gdx.files.internal("2.0");
755	759	fileHandle.copyTo(Gdx.files.local(FOLDER_RAW + File.separator/* + fileHandle.name()*/));
756		-// }
	760	+// }
757	761	}
758	762	}
759	763

diff -r e78bddaaf609 -r 6b925b668307 desktop/desktop.iml

--- a/desktop/desktop.iml Tue Feb 27 01:41:23 2018 +0200

+++ b/desktop/desktop.iml Sun Mar 25 22:32:25 2018 +0300

		@@ -39,7 +39,11 @@
39	39	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-freetype-1.9.6" level="project" />
40	40	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-backend-lwjgl-1.9.8" level="project" />
41	41	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-1.9.8" level="project" />
	42	+ <orderEntry type="library" exported="" scope="PROVIDED" name="jflex-1.6.1" level="project" />
	43	+ <orderEntry type="library" exported="" scope="PROVIDED" name="java-cup-11b-2015.03.26" level="project" />
42	44	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-freetype-platform-1.9.6-natives-desktop" level="project" />
	45	+ <orderEntry type="library" exported="" scope="PROVIDED" name="ant-1.7.0" level="project" />
	46	+ <orderEntry type="library" exported="" scope="PROVIDED" name="ant-launcher-1.7.0" level="project" />
43	47	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl_util-2.9.2" level="project" />
44	48	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-2.9.2" level="project" />
45	49	<orderEntry type="library" exported="" scope="PROVIDED" name="jlayer-1.0.1-gdx" level="project" />

diff -r e78bddaaf609 -r 6b925b668307 ios-moe/ios-moe.iml

--- a/ios-moe/ios-moe.iml Tue Feb 27 01:41:23 2018 +0200

+++ b/ios-moe/ios-moe.iml Sun Mar 25 22:32:25 2018 +0300

		@@ -38,14 +38,18 @@
38	38	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-bullet-1.9.6" level="project" />
39	39	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-backend-lwjgl-1.9.8" level="project" />
40	40	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-1.9.8" level="project" />
	41	+ <orderEntry type="library" exported="" scope="PROVIDED" name="jflex-1.6.1" level="project" />
	42	+ <orderEntry type="library" exported="" scope="PROVIDED" name="java-cup-11b-2015.03.26" level="project" />
41	43	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl_util-2.9.2" level="project" />
42	44	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-2.9.2" level="project" />
43	45	<orderEntry type="library" exported="" scope="PROVIDED" name="jlayer-1.0.1-gdx" level="project" />
44	46	<orderEntry type="library" exported="" scope="PROVIDED" name="jorbis-0.0.17" level="project" />
	47	+ <orderEntry type="library" exported="" scope="PROVIDED" name="ant-1.7.0" level="project" />
45	48	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-platform-2.9.2-natives-windows" level="project" />
46	49	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-platform-2.9.2-natives-linux" level="project" />
47	50	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-platform-2.9.2-natives-osx" level="project" />
48	51	<orderEntry type="library" exported="" scope="PROVIDED" name="jinput-2.0.5" level="project" />
	52	+ <orderEntry type="library" exported="" scope="PROVIDED" name="ant-launcher-1.7.0" level="project" />
49	53	<orderEntry type="library" exported="" scope="PROVIDED" name="jutils-1.0.0" level="project" />
50	54	<orderEntry type="library" exported="" scope="PROVIDED" name="jinput-platform-2.0.5-natives-linux" level="project" />
51	55	<orderEntry type="library" exported="" scope="PROVIDED" name="jinput-platform-2.0.5-natives-windows" level="project" />

diff -r e78bddaaf609 -r 6b925b668307 ios/ios.iml

--- a/ios/ios.iml Tue Feb 27 01:41:23 2018 +0200

+++ b/ios/ios.iml Sun Mar 25 22:32:25 2018 +0300

		@@ -39,15 +39,19 @@
39	39	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-bullet-1.9.6" level="project" />
40	40	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-backend-lwjgl-1.9.8" level="project" />
41	41	<orderEntry type="library" exported="" scope="PROVIDED" name="gdx-1.9.8" level="project" />
	42	+ <orderEntry type="library" exported="" scope="PROVIDED" name="jflex-1.6.1" level="project" />
	43	+ <orderEntry type="library" exported="" scope="PROVIDED" name="java-cup-11b-2015.03.26" level="project" />
42	44	<orderEntry type="library" exported="" scope="PROVIDED" name="robovm-objc-2.3.1" level="project" />
43	45	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl_util-2.9.2" level="project" />
44	46	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-2.9.2" level="project" />
45	47	<orderEntry type="library" exported="" scope="PROVIDED" name="jlayer-1.0.1-gdx" level="project" />
46	48	<orderEntry type="library" exported="" scope="PROVIDED" name="jorbis-0.0.17" level="project" />
	49	+ <orderEntry type="library" exported="" scope="PROVIDED" name="ant-1.7.0" level="project" />
47	50	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-platform-2.9.2-natives-windows" level="project" />
48	51	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-platform-2.9.2-natives-linux" level="project" />
49	52	<orderEntry type="library" exported="" scope="PROVIDED" name="lwjgl-platform-2.9.2-natives-osx" level="project" />
50	53	<orderEntry type="library" exported="" scope="PROVIDED" name="jinput-2.0.5" level="project" />
	54	+ <orderEntry type="library" exported="" scope="PROVIDED" name="ant-launcher-1.7.0" level="project" />
51	55	<orderEntry type="library" exported="" scope="PROVIDED" name="jutils-1.0.0" level="project" />
52	56	<orderEntry type="library" exported="" scope="PROVIDED" name="jinput-platform-2.0.5-natives-linux" level="project" />
53	57	<orderEntry type="library" exported="" scope="PROVIDED" name="jinput-platform-2.0.5-natives-windows" level="project" />

HotshotOnline Fork