Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
2e0a0fa
First iOS client changes
Feb 18, 2016
baf9b10
Updating client so geojson-formatted DEM can be read
Feb 29, 2016
0503d20
Pointing at server, restoring default mesh res
Mar 2, 2016
9fb04d1
Generated
Mar 4, 2016
db17f6d
changing pyramid classes
Mar 4, 2016
a49e9a7
minor change on PyramidElevationDataProvider
Mar 4, 2016
883a42b
Avoiding unnecesary elevation requests
Mar 4, 2016
193fc66
Files reallocated
Mar 4, 2016
298e9a3
Converting
Mar 4, 2016
e7bc6d4
Generated
Mar 4, 2016
c23f514
Changing initialization in Pyramid Listener to help conversion
Mar 7, 2016
5b098ac
Adding virtual to headers
Mar 7, 2016
06dcf7c
Generated
Mar 7, 2016
7a9151a
Reverting last change, adding java_code macros
Mar 7, 2016
f6ac736
Merge branch 'str-elevs' of https://github.com/glob3mobile/g3m into s…
Mar 7, 2016
9e111dc
Generated
Mar 7, 2016
154119c
replacing classes
Mar 7, 2016
64b7370
Generated
Mar 7, 2016
627aeb8
Changing import to include
Mar 7, 2016
f2159b9
Generated
Mar 7, 2016
0ccfb3c
Fixing conversion issues on Pytamid requestStringPath
Mar 7, 2016
593d7a5
Generated
Mar 7, 2016
a985ec8
Fixing conversion issues, adding references to getElevationData
Mar 7, 2016
3d16749
Generated
Mar 7, 2016
6d0f1e4
Removing not needed functions and variables, adding demo for Android
Mar 7, 2016
034b575
Generated
Mar 7, 2016
9a2d07b
Fixing metadata listener issues, adding WebGL pyramid demo
Mar 7, 2016
828766c
Generated
Mar 7, 2016
c97d8b7
Restoring demos to ulpgc machine
Mar 8, 2016
d3f8b2d
adding second requestElevData in Composite and WMSBil files
Mar 9, 2016
74ca529
Generated
Mar 9, 2016
cdea6e9
Merge branch 'purgatory' into str-elevs
Mar 9, 2016
e1b2d86
Merging from purgatory
Mar 9, 2016
4fd4b0c
Generated
Mar 9, 2016
ec17b0e
Adding Vertical Exaggeration selector, saving last camera state
Mar 9, 2016
60fd95d
Merge branch 'purgatory' into str-elevs
Mar 9, 2016
5c57fa2
Adding elevDatRequest cancel call in prune method
Mar 10, 2016
d72668e
Generated
Mar 10, 2016
2f9fc69
Cleaning
Mar 10, 2016
1b3f96e
Generated
Mar 10, 2016
84e138f
iOS G3MApp demo scene, solving pointer issues
Mar 10, 2016
b959387
Generated
Mar 10, 2016
8ce4826
Only a tile-based elevationDataRequest, JSON Dem Parser in separated …
Mar 15, 2016
832f944
Memory leak avoided on Pyramid class, Java-related compilation error …
Mar 16, 2016
a72d6f4
Changing double[] with std::vector<double> in metadata calculations
Mar 16, 2016
5a65095
Adding JAVA_CODE to download listener destructor
Mar 16, 2016
0e6261d
.
Mar 16, 2016
f9f1fd0
PosMoving placement of JSONDemParser files, correcting huge memory bu…
Mar 16, 2016
5e213c0
Generated
Mar 16, 2016
c7f9ec1
Fixing some Java issues
Mar 16, 2016
81f5fbe
Generated
Mar 16, 2016
6604e55
Fixing other Java issues
Mar 16, 2016
eb34323
Generated
Mar 16, 2016
271fbe7
warnings, getMinResolution for Pyramid class
Mar 17, 2016
e217b21
Generated
Mar 17, 2016
6482baa
Putting a lost block symbol, removing an unnecesary file
Mar 17, 2016
18c7793
Generated
Mar 17, 2016
6601d7e
Asyncronous JSON parsing for pyramids
Mar 23, 2016
d0a40bb
Merge branch 'purgatory' into str-elevs
Apr 5, 2016
c312447
Merging with purgatory
Apr 5, 2016
d7fe052
Refactoring ElevDataProvider so no tiles will be used
Apr 5, 2016
f8497c3
Refactoring JSONDemParser so time-consuming parse() function is calle…
Apr 5, 2016
9460bf6
First introducing FrameTask for Tessellator Mesh (elevs) generation
Apr 6, 2016
f64b0d5
Improving mesh visualization while using FrameTasks
Apr 6, 2016
f3c537c
Generated
Apr 6, 2016
6d61a99
Fixing Java conversion issues for FrameTask implementation
Apr 6, 2016
c68e459
Generated
Apr 6, 2016
6eae5d8
Cleaning
Apr 6, 2016
b3960e4
Generated
Apr 6, 2016
9f3a161
Merge branch 'purgatory' into str-elevs
Apr 7, 2016
c788ec6
Merging last purgatory changes
Apr 7, 2016
5d9463f
Merging from purgatory
Apr 19, 2016
c51d8b9
Profiling for json and bil formats
Apr 19, 2016
1dbfba2
Merge branch 'purgatory' into str-elevs
Apr 21, 2016
55b44fa
Merging with purgatory 2
Apr 21, 2016
dbee346
Generated
Apr 21, 2016
32c11dc
Fixing issue related to elevData for levels higher than pyramid maxim…
May 25, 2016
2af2b4b
Generated
May 25, 2016
7938d71
Restoring bil format reading
Jun 15, 2016
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
50 changes: 50 additions & 0 deletions Android/G3MAndroidTestingApplication/res/layout/goto_dialog.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<EditText
android:id="@+id/lat_edit"
android:hint="latitude"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<EditText
android:id="@+id/lon_edit"
android:hint="longitude"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<EditText
android:id="@+id/hgt_edit"
android:hint="height"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<EditText
android:id="@+id/pitch_edit"
android:hint="pitch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<Button
android:id="@+id/ok_button"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/ok_button"
/>
<Button
android:id="@+id/cancel_button"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/cancel_button"/>
</LinearLayout>
</LinearLayout>
44 changes: 44 additions & 0 deletions Android/G3MAndroidTestingApplication/res/layout/loader_dialog.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<Spinner
android:id="@+id/size_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:entries="@array/size_array"
/>
<Spinner
android:id="@+id/wireframe_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:entries="@array/wireframe_array"
/>
<EditText
android:id="@+id/vertex_edittext"
android:hint="Vertical Exaggeration"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<Button
android:id="@+id/ok_button"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/ok_button"
/>
<Button
android:id="@+id/cancel_button"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/cancel_button"/>
</LinearLayout>
</LinearLayout>
21 changes: 18 additions & 3 deletions Android/G3MAndroidTestingApplication/res/menu/main.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" >

<item
<!-- Original item -->
<!-- <item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:showAsAction="never"
android:title="@string/action_settings"/>
android:title="@string/action_settings"/> -->
<item
android:id="@+id/load"
android:orderInCategory="100"
android:showAsAction="ifRoom"
android:title="@string/load"/>
<item
android:id="@+id/go"
android:orderInCategory="100"
android:showAsAction="ifRoom"
android:title="@string/go"/>
<item
android:id="@+id/clear"
android:orderInCategory="100"
android:showAsAction="ifRoom"
android:title="@string/clear"/>

</menu>
21 changes: 20 additions & 1 deletion Android/G3MAndroidTestingApplication/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,24 @@
<string name="app_name">G3MAndroidTestingApplication</string>
<string name="action_settings">Settings</string>
<string name="hello_world">Hello world!</string>


<string name="clear">Clear</string>
<string name="go">Go</string>
<string name="load">Load</string>
<string name="ok_button">OK</string>
<string name="cancel_button">Cancel</string>

<string-array name="size_array">
<item> --- Select an option --- </item>
<item> World Fixed 16x16 </item>
<item> World Variable 16x16 </item>
<item> Euro Fixed 16x16 </item>
<item> Euro Variable 16x16 </item>
</string-array>

<string-array name="wireframe_array">
<item> --- Select an option --- </item>
<item> Do not use wireframe </item>
<item> Use wireframe </item>
</string-array>
</resources>
Loading