Skip to content
Browse files

Merge pull request #2 from oxygine/master

test
  • Loading branch information...
2 parents ab2e80f + 6663257 commit 399f42d9c0fcbf984e703481f7e5224bdd43081d @frankinshtein frankinshtein committed Oct 8, 2012
Showing with 4 additions and 5 deletions.
  1. +1 −1 examples/example1/data/app.icf
  2. +2 −2 examples/example1/data/development.icf
  3. +1 −2 examples/example1/src/example.cpp
View
2 examples/example1/data/app.icf
@@ -1,7 +1,7 @@
[S3E]
MemSize = 32777216
DispFixRot=2
-SysGlesVersion=2
+SysGlesVersion=1
[Trace]
ALL=0
View
4 examples/example1/data/development.icf
@@ -87,14 +87,14 @@ SoundStereo = Type=bool, Default="true", Value = "true"
SoundVolumeDefault = Type=int, Min=0.000000, Max=256.000000, Default="256", Value = "256"
SurfaceDisableWhenGLIsActive = Type=bool, Default="false", Value = "false"
SurfaceDoubleBuffer = Type=bool, Default="false", Value = "false"
-SurfaceHeight = Type=int, Min=128.000000, Max=4096.000000, Default="480", Value = "320"
+SurfaceHeight = Type=int, Min=128.000000, Max=4096.000000, Default="480", Value = "640"
SurfacePitch = Type=int, Min=0.000000, Max=8192.000000, Default="0", Value = "0"
SurfacePixelType = Type=string, Allowed="RGB444" "RGB555" "RGB565" "RGB666" "RGB888" "BGR444" "BGR555" "BGR565" "BGR666" "BGR888", Default="RGB565", Value = "RGB565"
SurfacePredefinedResolution = Type=string, Allowed="176x200" "176x208" "240x320 (QVGA Portrait)" "240x400" "320x240 (QVGA Landscape)" "320x400" "320x480 (iPhone Portrait)" "400x240" "480x320 (iPhone Landscape)" "360x640 (qHD Portrait)" "640x360 (qHD Landscape)" "480x640 (VGA Portrait)" "480x800 (WVGA Portrait)" "640x480 (VGA Landscape)" "800x400" "800x480 (WVGA Landscape)" "640x960 (iPhone 4 Portrait)" "960x640 (iPhone 4 Landscape)" "1024x600 (Playbook Landscape)" "600x1024 (Playbook Portrait)" "768x1024 (iPad Portrait)" "1024x768 (iPad Landscape)" "2048x1536 (iPad Retina Landscape)" "1536x2048 (iPad Retina Portrait)", Default="320x480 (iPhone Portrait)", Value = "176x200"
SurfaceRotation = Type=string, Allowed="Rot0" "Rot90" "Rot180" "Rot270", Default="Rot0", Value = "Rot0"
SurfaceUnalign = Type=bool, Default="true", Value = "true"
SurfaceUseMultiBuffers = Type=bool, Default="true", Value = "true"
-SurfaceWidth = Type=int, Min=128.000000, Max=4096.000000, Default="320", Value = "480"
+SurfaceWidth = Type=int, Min=128.000000, Max=4096.000000, Default="320", Value = "960"
SymbianSoundLatency = Type=int, Min=20.000000, Max=1400.000000, Default="120", Value = "120"
ThreadEnabled = Type=bool, Default="true", Value = "true"
TimerAccuracy = Type=int, Min=0.000000, Max=1000.000000, Default="0", Value = "0"
View
3 examples/example1/src/example.cpp
@@ -36,9 +36,8 @@ void example_init()
}
}
- //
spAnimatedActor anim = new AnimatedActor();
- anim->setPosition(250, 0);
+ anim->setPosition(250, 80);
anim->setResAnim(animResources.getT<ResKeyframeAnimation>("godscores"));
anim->play();

0 comments on commit 399f42d

Please sign in to comment.
Something went wrong with that request. Please try again.