Skip to content

Commit b925bed

Browse files
committed
putting good 3D elements on markers
1 parent 4fcec96 commit b925bed

File tree

3 files changed

+23
-15
lines changed

3 files changed

+23
-15
lines changed

assets/Texture/chainsaw.png

-9 Bytes
Loading

src/com/imac/FlashMe/GameActivity.java

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ public void done(List<ParseObject> players, ParseException e) {
189189

190190
private void loadTextures() {
191191

192-
mTextures.add(Texture.loadTextureFromApk("Texture/scourge.png",getAssets()));
193-
mTextures.add(Texture.loadTextureFromApk("Texture/chainsaw.png",getAssets()));
194192
mTextures.add(Texture.loadTextureFromApk("Texture/gun.png",getAssets()));
193+
mTextures.add(Texture.loadTextureFromApk("Texture/chainsaw.png",getAssets()));
194+
mTextures.add(Texture.loadTextureFromApk("Texture/scourge.png",getAssets()));
195195
mTextures.add(Texture.loadTextureFromApk("Texture/munitions.png",getAssets()));
196196
mTextures.add(Texture.loadTextureFromApk("Texture/points.png",getAssets()));
197197
mTextures.add(Texture.loadTextureFromApk("Texture/poison.png",getAssets()));
@@ -305,12 +305,12 @@ public void onDataChange(DataSnapshot snapshot) {
305305
if (value == null) {
306306
Log.d(LOGTAG, "User doesn't exist");
307307
} else {
308-
String lifeValue = ((Map)value).get("life").toString();
309-
String munitionsValue = ((Map)value).get("munitions").toString();
310-
int gunId = Integer.parseInt(((Map)value).get("gun").toString());
311-
life.setText(lifeValue);
312-
munitions.setText(munitionsValue);
313-
gun = gunId;
308+
// String lifeValue = ((Map)value).get("life").toString();
309+
// String munitionsValue = ((Map)value).get("munitions").toString();
310+
// int gunId = Integer.parseInt(((Map)value).get("gun").toString());
311+
// life.setText(lifeValue);
312+
// munitions.setText(munitionsValue);
313+
// gun = gunId;
314314
}
315315
}
316316

@@ -622,8 +622,8 @@ public boolean doLoadTrackersData() {
622622
return false;
623623
}
624624

625-
// Marker[] dataSet = new Marker[markerIdToPlayerId.size() + 6];
626-
Marker[] dataSet = new Marker[markerIdToPlayerId.size()];
625+
Marker[] dataSet = new Marker[markerIdToPlayerId.size() + 6];
626+
//Marker[] dataSet = new Marker[markerIdToPlayerId.size()];
627627

628628
int i = 0;
629629
for (Entry<Integer, String> entry : markerIdToPlayerId.entrySet()) {
@@ -633,11 +633,15 @@ public boolean doLoadTrackersData() {
633633
}
634634
++i;
635635
}
636-
// int index = 506;
637-
// for(int j = markerIdToPlayerId.size(); j <markerIdToPlayerId.size() + 6; ++j) {
638-
// dataSet[j] = markerTracker.createFrameMarker(index, "" , new Vec2F(50, 50));
639-
// ++index;
640-
// }
636+
int index = 506;
637+
for(int j = dataSet.length-6; j <dataSet.length; ++j) {
638+
dataSet[j] = markerTracker.createFrameMarker(index, "index" + index , new Vec2F(50, 50));
639+
++index;
640+
}
641+
642+
for(int k = 0; k<dataSet.length; ++k){
643+
Log.d("index last marqueurs ", "#############" + dataSet[k]);
644+
}
641645

642646
GameActivity.this.dataSet = dataSet;
643647

src/com/imac/FlashMe/GameRenderer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ void renderFrame() {
165165
int markerId = marker.getMarkerId();
166166
String userId = marker.getName();
167167

168+
169+
168170
switch(markerId) {
169171
case 511:
170172
// Poison
@@ -180,6 +182,7 @@ void renderFrame() {
180182
// Munitions
181183
mActivity.updateMunitions(50);
182184
textureIndex = 3;
185+
break;
183186
case 508:
184187
// Scourge
185188
mActivity.updateGun(0);
@@ -200,6 +203,7 @@ void renderFrame() {
200203
break;
201204
}
202205

206+
Log.d("########################", "Marker " + textureIndex + " detected from ");
203207
Texture thisTexture = mTextures.get(textureIndex);
204208

205209
// Select which model to draw:

0 commit comments

Comments
 (0)